diff options
| author |   Changli Gao <xiaosuo@gmail.com> | 2011-01-18 15:08:13 +0100 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2011-01-18 15:08:13 +0100 |
| commit | 45eec34195853e918518231dcefaca1ea4ebacfc (patch) | |
| tree | 65c7a899c1a2ceb36d3b13e01320810cbaf7bb0f /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: nf_nat: fix conversion to non-atomic bit ops (diff) | |
| download | linux-dev-45eec34195853e918518231dcefaca1ea4ebacfc.tar.xz linux-dev-45eec34195853e918518231dcefaca1ea4ebacfc.zip | |
netfilter: nf_conntrack: remove an atomic bit operation
As this ct won't be seen by the others, we don't need to set the
IPS_CONFIRMED_BIT in atomic way.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Cc: Tim Gardner <tim.gardner@canonical.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index dc2ff2cd0a7e..f47ac67e1bfe 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -486,7 +486,7 @@ __nf_conntrack_confirm(struct sk_buff *skb) ct->timeout.expires += jiffies; add_timer(&ct->timeout); atomic_inc(&ct->ct_general.use); - set_bit(IPS_CONFIRMED_BIT, &ct->status); + ct->status |= IPS_CONFIRMED; /* Since the lookup is lockless, hash insertion must be done after * starting the timer and setting the CONFIRMED bit. The RCU barriers |