From 52e2800adea96971a47a45aedec074d873e79dc0 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 26 Dec 2008 01:31:18 -0800 Subject: [PATCH] --- yaml --- r: 122929 b: refs/heads/master c: f2712fd0b4097e8385bdb75c0ebd285a057fe299 h: refs/heads/master i: 122927: 2a4415148477ed16f6bc818eaf7d1f3d6a037124 v: v3 --- [refs] | 2 +- trunk/net/ipv4/xfrm4_input.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1f0b55cd28c8..e70a4d0c4038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb614c28487df41f7bf2c98e85f29f31885561e +refs/heads/master: f2712fd0b4097e8385bdb75c0ebd285a057fe299 diff --git a/trunk/net/ipv4/xfrm4_input.c b/trunk/net/ipv4/xfrm4_input.c index 390dcb1354a5..4ec2162a437e 100644 --- a/trunk/net/ipv4/xfrm4_input.c +++ b/trunk/net/ipv4/xfrm4_input.c @@ -78,7 +78,6 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) struct udphdr *uh; struct iphdr *iph; int iphlen, len; - int ret; __u8 *udpdata; __be32 *udpdata32; @@ -152,8 +151,7 @@ int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) skb_reset_transport_header(skb); /* process ESP */ - ret = xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, encap_type); - return ret; + return xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, encap_type); drop: kfree_skb(skb);