Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_netlink.c

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 9be1826e6cdd30ded188df436c604051b67653c5..7d231243754ac089dbbf0f61f2eef20bd0908395 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1024,8 +1024,10 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
        }
 
        /* setup master conntrack: this is a confirmed expectation */
-       if (master_ct)
+       if (master_ct) {
+               __set_bit(IPS_EXPECTED_BIT, &ct->status);
                ct->master = master_ct;
+       }
 
        add_timer(&ct->timeout);
        nf_conntrack_hash_insert(ct);