projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[cascardo/linux.git]
/
net
/
ipv6
/
ip6_vti.c
diff --git
a/net/ipv6/ip6_vti.c
b/net/ipv6/ip6_vti.c
index
52a2f73
..
5bd3afd
100644
(file)
--- a/
net/ipv6/ip6_vti.c
+++ b/
net/ipv6/ip6_vti.c
@@
-321,11
+321,9
@@
static int vti6_rcv(struct sk_buff *skb)
goto discard;
}
- XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6 = t;
-
rcu_read_unlock();
- return xfrm6_rcv
(skb
);
+ return xfrm6_rcv
_tnl(skb, t
);
}
rcu_read_unlock();
return -EINVAL;