projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7c2f4d
)
netfilter: nf_conntrack: remove an atomic bit operation
author
Changli Gao
<
[email protected]
>
Tue, 18 Jan 2011 14:08:13 +0000
(15:08 +0100)
committer
Patrick McHardy
<
[email protected]
>
Tue, 18 Jan 2011 14:08:13 +0000
(15:08 +0100)
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 <
[email protected]
>
Cc: Tim Gardner <
[email protected]
>
Cc: Eric Dumazet <
[email protected]
>
Signed-off-by: Patrick McHardy <
[email protected]
>
net/netfilter/nf_conntrack_core.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_core.c
b/net/netfilter/nf_conntrack_core.c
index dc2ff2cd0a7eb6e5d80f25522316aad612a3f7a6..f47ac67e1bfefc6e12e2bfbb2327e3388f84cc4b 100644
(file)
--- 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