git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/i8259
[sfrench/cifs-2.6.git]
/
net
/
ipv6
/
tunnel6.c
diff --git
a/net/ipv6/tunnel6.c
b/net/ipv6/tunnel6.c
index 6323921b40bec37bb474fefadc1d66f3586738d9..669f280989c351ce6c9b2e29ed934e1c3d02a937 100644
(file)
--- a/
net/ipv6/tunnel6.c
+++ b/
net/ipv6/tunnel6.c
@@
-109,7
+109,7
@@
static int tunnel46_rcv(struct sk_buff *skb)
{
struct xfrm6_tunnel *handler;
- if (!pskb_may_pull(skb, sizeof(struct ip
v6
hdr)))
+ if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto drop;
for (handler = tunnel46_handlers; handler; handler = handler->next)