diff options
| author | David S. Miller | 2011-02-04 23:28:58 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-02-04 23:28:58 +0100 |
| commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
| tree | e96ef46426d293b730a305b5185ba5412c9172d4 /net/netfilter/nf_conntrack_netlink.c | |
| parent | be2net: use device model DMA API (diff) | |
| parent | net: can: janz-ican3: world-writable sysfs termination file (diff) | |
| download | kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.gz kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.xz kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index b4df3eff4240..30bf8a167fc8 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -710,6 +710,7 @@ restart: if (ctnetlink_fill_info(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, IPCTNL_MSG_CT_NEW, ct) < 0) { + nf_conntrack_get(&ct->ct_general); cb->args[1] = (unsigned long)ct; goto out; } |