projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /repos/git/net-next-2.6
[cascardo/linux.git]
/
net
/
ipv6
/
netfilter
/
nf_conntrack_reasm.c
diff --git
a/net/ipv6/netfilter/nf_conntrack_reasm.c
b/net/ipv6/netfilter/nf_conntrack_reasm.c
index
f1171b7
..
6fb8901
100644
(file)
--- a/
net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/
net/ipv6/netfilter/nf_conntrack_reasm.c
@@
-27,6
+27,7
@@
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
#include <linux/random.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
#include <linux/random.h>
+#include <linux/slab.h>
#include <net/sock.h>
#include <net/snmp.h>
#include <net/sock.h>
#include <net/snmp.h>
@@
-643,7
+644,7
@@
void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
s2 = s->next;
s->next = NULL;
s2 = s->next;
s->next = NULL;
- NF_HOOK_THRESH(
PF_INET
6, hooknum, s, in, out, okfn,
+ NF_HOOK_THRESH(
NFPROTO_IPV
6, hooknum, s, in, out, okfn,
NF_IP6_PRI_CONNTRACK_DEFRAG + 1);
s = s2;
}
NF_IP6_PRI_CONNTRACK_DEFRAG + 1);
s = s2;
}