diff options
| author |   Changli Gao <xiaosuo@gmail.com> | 2010-11-15 11:59:03 +0100 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2010-11-15 11:59:03 +0100 |
| commit | 76a2d3bcfcc86e2a8044258515b86492a37631a3 (patch) | |
| tree | f6363f3a6d48becbfe15320744cddc6d4bab30a6 /net/ipv4/netfilter | |
| parent | netfilter: nf_conntrack: define ct_*_info as needed (diff) | |
| download | linux-dev-76a2d3bcfcc86e2a8044258515b86492a37631a3.tar.xz linux-dev-76a2d3bcfcc86e2a8044258515b86492a37631a3.zip | |
netfilter: nf_nat: don't use atomic bit operation
As we own the conntrack and the others can't see it until we confirm it,
we don't need to use atomic bit operation on ct->status.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/netfilter')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index c04787ce1a71..ab877acb22a1 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -323,9 +323,9 @@ nf_nat_setup_info(struct nf_conn *ct, /* It's done. */ if (maniptype == IP_NAT_MANIP_DST) - set_bit(IPS_DST_NAT_DONE_BIT, &ct->status); + ct->status |= IPS_DST_NAT_DONE_BIT; else - set_bit(IPS_SRC_NAT_DONE_BIT, &ct->status); + ct->status |= IPS_SRC_NAT_DONE_BIT; return NF_ACCEPT; } |