From: Changli Gao <xiaosuo@gmail.com>
Date: Tue, 18 Jan 2011 14:08:13 +0000 (+0100)
Subject: netfilter: nf_conntrack: remove an atomic bit operation
X-Git-Tag: MMI-PSA29.97-13-9~20520^2~510^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45eec34195853e918518231dcefaca1ea4ebacfc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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