diff options
| author | Alexey Dobriyan | 2008-10-08 11:35:03 +0200 |
|---|---|---|
| committer | Patrick McHardy | 2008-10-08 11:35:03 +0200 |
| commit | 400dad39d1c33fe797e47326d87a3f54d0ac5181 (patch) | |
| tree | f3bb7c9f75bd24161c2dd745f1b475f5a6165cae /net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |
| parent | netfilter: netns nf_conntrack: per-netns conntrack count (diff) | |
| download | kernel-qcow2-linux-400dad39d1c33fe797e47326d87a3f54d0ac5181.tar.gz kernel-qcow2-linux-400dad39d1c33fe797e47326d87a3f54d0ac5181.tar.xz kernel-qcow2-linux-400dad39d1c33fe797e47326d87a3f54d0ac5181.zip | |
netfilter: netns nf_conntrack: per-netns conntrack hash
* make per-netns conntrack hash
Other solution is to add ->ct_net pointer to tuplehashes and still has one
hash, I tried that it's ugly and requires more code deep down in protocol
modules et al.
* propagate netns pointer to where needed, e. g. to conntrack iterators.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 31abee3e29f9..03dd108015c2 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c @@ -323,7 +323,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) return -EINVAL; } - h = nf_conntrack_find_get(&tuple); + h = nf_conntrack_find_get(sock_net(sk), &tuple); if (h) { struct sockaddr_in sin; struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); |