projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
net
/
ipv6
/
netfilter
/
ip6t_esp.c
diff --git
a/net/ipv6/netfilter/ip6t_esp.c
b/net/ipv6/netfilter/ip6t_esp.c
index
65937de
..
e1828f6
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_esp.c
+++ b/
net/ipv6/netfilter/ip6t_esp.c
@@
-56,7
+56,7
@@
match(const struct sk_buff *skb,
/* Make sure this isn't an evil packet */
/*DEBUGP("ipv6_esp entered \n");*/
- if (ipv6_find_hdr(skb, &ptr, NEXTHDR_ESP) < 0)
+ if (ipv6_find_hdr(skb, &ptr, NEXTHDR_ESP
, NULL
) < 0)
return 0;
eh = skb_header_pointer(skb, ptr, sizeof(_esp), &_esp);