projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c4a5cb
)
ipv6: Fix return of xfrm6_tunnel_rcv()
author
David S. Miller
<davem@davemloft.net>
Tue, 24 May 2011 05:11:51 +0000
(
01:11
-0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 24 May 2011 05:11:51 +0000
(
01:11
-0400)
Like ipv4, just return xfrm6_rcv_spi()'s return value directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/xfrm6_tunnel.c
patch
|
blob
|
history
diff --git
a/net/ipv6/xfrm6_tunnel.c
b/net/ipv6/xfrm6_tunnel.c
index
a6770a0
..
4fe1db1
100644
(file)
--- 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,