summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-24 01:11:51 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-24 01:11:51 -0400
commit6ac3f6649223d916bbdf1e823926f8f3b34b5d99 (patch)
tree56d4e08336c534026923816188e484ef01b3b5dc
parent6c4a5cb219520c7bc937ee186ca53f03733bd09f (diff)
downloadop-kernel-dev-6ac3f6649223d916bbdf1e823926f8f3b34b5d99.zip
op-kernel-dev-6ac3f6649223d916bbdf1e823926f8f3b34b5d99.tar.gz
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>
-rw-r--r--net/ipv6/xfrm6_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index a6770a0..4fe1db12 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,
OpenPOWER on IntegriCloud