]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipcomp: Fix warnings after ipcomp consolidation.
authorDavid S. Miller <davem@davemloft.net>
Sun, 27 Jul 2008 10:59:24 +0000 (03:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 27 Jul 2008 10:59:24 +0000 (03:59 -0700)
net/ipv4/ipcomp.c: In function ‘ipcomp4_init_state’:
net/ipv4/ipcomp.c:109: warning: unused variable ‘calg_desc’
net/ipv4/ipcomp.c:108: warning: unused variable ‘ipcd’
net/ipv4/ipcomp.c:107: warning: ‘err’ may be used uninitialized in this function
net/ipv6/ipcomp6.c: In function ‘ipcomp6_init_state’:
net/ipv6/ipcomp6.c:139: warning: unused variable ‘calg_desc’
net/ipv6/ipcomp6.c:138: warning: unused variable ‘ipcd’
net/ipv6/ipcomp6.c:137: warning: ‘err’ may be used uninitialized in this function

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipcomp.c
net/ipv6/ipcomp6.c

index a42b64d040c407efb0d862644fd2169e61451812..38ccb6dfb02e1c755f8ec03f6d793ec16121784f 100644 (file)
@@ -104,9 +104,7 @@ out:
 
 static int ipcomp4_init_state(struct xfrm_state *x)
 {
-       int err;
-       struct ipcomp_data *ipcd;
-       struct xfrm_algo_desc *calg_desc;
+       int err = -EINVAL;
 
        x->props.header_len = 0;
        switch (x->props.mode) {
index 0cfcea42153a1a8444dfc95f548872c4056586bc..4545e4306862b104217aa5189eac1d4b64c1b43e 100644 (file)
@@ -134,9 +134,7 @@ out:
 
 static int ipcomp6_init_state(struct xfrm_state *x)
 {
-       int err;
-       struct ipcomp_data *ipcd;
-       struct xfrm_algo_desc *calg_desc;
+       int err = -EINVAL;
 
        x->props.header_len = 0;
        switch (x->props.mode) {