summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-31 13:38:19 +0100
committerDavid S. Miller <davem@davemloft.net>2008-02-01 04:27:53 +0100
commit7d0742da1c8f5df3a34030f0170b30d1a052be80 (patch)
treef5717a37a9b4fe27abfa7886996d7051c57b91b9 /include/net
parent[NETFILTER]: nf_conntrack_core: avoid taking nf_conntrack_lock in nf_conntrac... (diff)
downloadlinux-7d0742da1c8f5df3a34030f0170b30d1a052be80.tar.xz
linux-7d0742da1c8f5df3a34030f0170b30d1a052be80.zip
[NETFILTER]: nf_conntrack_expect: use RCU for expectation hash
Use RCU for expectation hash. This doesn't buy much for conntrack runtime performance, but allows to reduce the use of nf_conntrack_lock for /proc and nf_netlink_conntrack. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_expect.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 6c3fd254c28e..cb608a1b44e5 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -49,6 +49,8 @@ struct nf_conntrack_expect
/* Direction relative to the master connection. */
enum ip_conntrack_dir dir;
#endif
+
+ struct rcu_head rcu;
};
#define NF_CT_EXPECT_PERMANENT 0x1