Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[linux-2.6-microblaze.git] / net / netfilter / xt_conntrack.c

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index c0fb217..39cf1d0 100644 (file)
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -172,12 +172,11 @@ conntrack_mt(const struct sk_buff *skb, struct xt_action_param *par,
 
        ct = nf_ct_get(skb, &ctinfo);
 
-       if (ct) {
-               if (nf_ct_is_untracked(ct))
-                       statebit = XT_CONNTRACK_STATE_UNTRACKED;
-               else
-                       statebit = XT_CONNTRACK_STATE_BIT(ctinfo);
-       } else
+       if (ct)
+               statebit = XT_CONNTRACK_STATE_BIT(ctinfo);
+       else if (ctinfo == IP_CT_UNTRACKED)
+               statebit = XT_CONNTRACK_STATE_UNTRACKED;
+       else
                statebit = XT_CONNTRACK_STATE_INVALID;
 
        if (info->match_flags & XT_CONNTRACK_STATE) {