diff options
author | Martin Josefsson <gandalf@wlug.westbo.se> | 2006-11-29 02:35:09 +0100 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:31:11 -0800 |
commit | 951d36cace3d3ad2ac6c222e126aed4113ad2bf7 (patch) | |
tree | a1fb1c53fad205937db55ea352c8b220e08fbedf /net/netfilter/nf_conntrack_standalone.c | |
parent | ae5718fb3dd0a11a4c9a061bf86417d52d58a6b3 (diff) | |
download | op-kernel-dev-951d36cace3d3ad2ac6c222e126aed4113ad2bf7.zip op-kernel-dev-951d36cace3d3ad2ac6c222e126aed4113ad2bf7.tar.gz |
[NETFILTER]: nf_conntrack: remove ASSERT_{READ,WRITE}_LOCK
Remove the usage of ASSERT_READ_LOCK/ASSERT_WRITE_LOCK in nf_conntrack,
it didn't do anything, it was just an empty define and it uglified the code.
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
-rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 6ebac7d..f87d333 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -29,9 +29,6 @@ #include <linux/sysctl.h> #endif -#define ASSERT_READ_LOCK(x) -#define ASSERT_WRITE_LOCK(x) - #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_l3proto.h> @@ -137,7 +134,6 @@ static int ct_seq_show(struct seq_file *s, void *v) struct nf_conntrack_l3proto *l3proto; struct nf_conntrack_l4proto *l4proto; - ASSERT_READ_LOCK(&nf_conntrack_lock); NF_CT_ASSERT(conntrack); /* we only want to print DIR_ORIGINAL */ |