aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-12-26 04:31:18 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-26 04:31:18 -0500
commitf2712fd0b4097e8385bdb75c0ebd285a057fe299 (patch)
treef2e1a1b4d5e7f9e9103c714893b0fd792e20c54b /net
parentfdb614c28487df41f7bf2c98e85f29f31885561e (diff)
ipsec: Remove useless ret variable
This patch removes a useless ret variable from the IPv4 ESP/UDP decapsulation code. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/xfrm4_input.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 390dcb1354a5..4ec2162a437e 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -78,7 +78,6 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
78 struct udphdr *uh; 78 struct udphdr *uh;
79 struct iphdr *iph; 79 struct iphdr *iph;
80 int iphlen, len; 80 int iphlen, len;
81 int ret;
82 81
83 __u8 *udpdata; 82 __u8 *udpdata;
84 __be32 *udpdata32; 83 __be32 *udpdata32;
@@ -152,8 +151,7 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
152 skb_reset_transport_header(skb); 151 skb_reset_transport_header(skb);
153 152
154 /* process ESP */ 153 /* process ESP */
155 ret = xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, encap_type); 154 return xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, encap_type);
156 return ret;
157 155
158drop: 156drop:
159 kfree_skb(skb); 157 kfree_skb(skb);