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 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
netfilter
/
xt_cluster.c
diff --git
a/net/netfilter/xt_cluster.c
b/net/netfilter/xt_cluster.c
index 30b95a1c1c892da3018bbf9084e4fe3a8d59b4b1..f4af1bfafb1c61642ddb56ac490f7e161df5d39d 100644
(file)
--- a/
net/netfilter/xt_cluster.c
+++ b/
net/netfilter/xt_cluster.c
@@
-120,7
+120,7
@@
xt_cluster_mt(const struct sk_buff *skb, struct xt_action_param *par)
if (ct == NULL)
return false;
- if (
ct == &nf_conntrack_untracked
)
+ if (
nf_ct_is_untracked(ct)
)
return false;
if (ct->master)