From: David S. Miller Date: Tue, 24 May 2011 05:11:51 +0000 (-0400) Subject: ipv6: Fix return of xfrm6_tunnel_rcv() X-Git-Tag: v2.6.32.68~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e0d75484e14aa5256cb364db0fb49a05f6b83e9;p=thirdparty%2Fkernel%2Fstable.git ipv6: Fix return of xfrm6_tunnel_rcv() commit 6ac3f6649223d916bbdf1e823926f8f3b34b5d99 upstream. Like ipv4, just return xfrm6_rcv_spi()'s return value directly. Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 48bb1e301d497..5980e6e702087 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -258,7 +258,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb) __be32 spi; spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr); - return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi) > 0 ? : 0; + return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi); } static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,