Merge git://git.infradead.org/~dwmw2/firmware-2.6

[sfrench/cifs-2.6.git] / net / ipv4 / xfrm4_input.c

diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 390dcb1354a5e4f6c76ad0c9bf8d3bc238a217ab..4ec2162a437ecc1faca91a862486e53422ab8cb2 100644 (file)
--- 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)
        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);