diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-24 01:11:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-24 01:11:51 -0400 |
| commit | 6ac3f6649223d916bbdf1e823926f8f3b34b5d99 (patch) | |
| tree | 56d4e08336c534026923816188e484ef01b3b5dc /net/ipv6/xfrm6_tunnel.c | |
| parent | 6c4a5cb219520c7bc937ee186ca53f03733bd09f (diff) | |
| download | blackbird-op-linux-6ac3f6649223d916bbdf1e823926f8f3b34b5d99.tar.gz blackbird-op-linux-6ac3f6649223d916bbdf1e823926f8f3b34b5d99.zip | |
ipv6: Fix return of xfrm6_tunnel_rcv()
Like ipv4, just return xfrm6_rcv_spi()'s return value directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -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 a6770a04e3bd..4fe1db12d2a3 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -241,7 +241,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb) __be32 spi; spi = xfrm6_tunnel_spi_lookup(net, (const 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, |
