diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-24 01:11:51 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:20 +0200 |
| commit | 9e0d75484e14aa5256cb364db0fb49a05f6b83e9 (patch) | |
| tree | 6a53125a10c49f9f0272010bcbb4ab84e8ebf46b | |
| parent | 17fce98016a7d200c691440da403cc65369657d4 (diff) | |
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 <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 48bb1e301d49..5980e6e70208 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, |