projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
net
/
netfilter
/
xt_NOTRACK.c
diff --git
a/net/netfilter/xt_NOTRACK.c
b/net/netfilter/xt_NOTRACK.c
index
6d00dca
..
5085fb3
100644
(file)
--- a/
net/netfilter/xt_NOTRACK.c
+++ b/
net/netfilter/xt_NOTRACK.c
@@
-5,7
+5,7
@@
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <net/netfilter/nf_conntrack
_compat
.h>
+#include <net/netfilter/nf_conntrack.h>
MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_NOTRACK");
MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_NOTRACK");
@@
-22,11
+22,11
@@
target(struct sk_buff **pskb,
if ((*pskb)->nfct != NULL)
return XT_CONTINUE;
if ((*pskb)->nfct != NULL)
return XT_CONTINUE;
- /* Attach fake conntrack entry.
- If there is a real ct entry correspondig to this packet,
+ /* Attach fake conntrack entry.
+ If there is a real ct entry correspondig to this packet,
it'll hang aroun till timing out. We don't deal with it
for performance reasons. JK */
it'll hang aroun till timing out. We don't deal with it
for performance reasons. JK */
-
nf_ct_untrack(*pskb)
;
+
(*pskb)->nfct = &nf_conntrack_untracked.ct_general
;
(*pskb)->nfctinfo = IP_CT_NEW;
nf_conntrack_get((*pskb)->nfct);
(*pskb)->nfctinfo = IP_CT_NEW;
nf_conntrack_get((*pskb)->nfct);