* [PATCH] netfilter: don't use atomic bit operation
@ 2010-11-14 9:05 Changli Gao
2010-11-15 10:59 ` Patrick McHardy
0 siblings, 1 reply; 3+ messages in thread
From: Changli Gao @ 2010-11-14 9:05 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David S. Miller, netfilter-devel, netdev, Changli Gao
As we own ct, 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>
---
include/net/netfilter/nf_nat_core.h | 4 ++--
net/ipv4/netfilter/nf_nat_core.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
index 33602ab..52ac1d8 100644
--- a/include/net/netfilter/nf_nat_core.h
+++ b/include/net/netfilter/nf_nat_core.h
@@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct,
enum nf_nat_manip_type manip)
{
if (manip == IP_NAT_MANIP_SRC)
- return test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);
+ return IPS_SRC_NAT_DONE_BIT & ct->status;
else
- return test_bit(IPS_DST_NAT_DONE_BIT, &ct->status);
+ return IPS_DST_NAT_DONE_BIT & ct->status;
}
struct nlattr;
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index c04787c..ab877ac 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] netfilter: don't use atomic bit operation
2010-11-14 9:05 [PATCH] netfilter: don't use atomic bit operation Changli Gao
@ 2010-11-15 10:59 ` Patrick McHardy
2010-11-20 23:40 ` Changli Gao
0 siblings, 1 reply; 3+ messages in thread
From: Patrick McHardy @ 2010-11-15 10:59 UTC (permalink / raw)
To: Changli Gao; +Cc: David S. Miller, netfilter-devel, netdev
On 14.11.2010 10:05, Changli Gao wrote:
> As we own ct, 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>
> ---
> include/net/netfilter/nf_nat_core.h | 4 ++--
> net/ipv4/netfilter/nf_nat_core.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
> diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
> index 33602ab..52ac1d8 100644
> --- a/include/net/netfilter/nf_nat_core.h
> +++ b/include/net/netfilter/nf_nat_core.h
> @@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct,
> enum nf_nat_manip_type manip)
> {
> if (manip == IP_NAT_MANIP_SRC)
> - return test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);
> + return IPS_SRC_NAT_DONE_BIT & ct->status;
> else
> - return test_bit(IPS_DST_NAT_DONE_BIT, &ct->status);
> + return IPS_DST_NAT_DONE_BIT & ct->status;
> }
Looks fine, but I changed the order to ct->status & ...
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] netfilter: don't use atomic bit operation
2010-11-15 10:59 ` Patrick McHardy
@ 2010-11-20 23:40 ` Changli Gao
0 siblings, 0 replies; 3+ messages in thread
From: Changli Gao @ 2010-11-20 23:40 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David S. Miller, netfilter-devel, netdev
On Mon, Nov 15, 2010 at 6:59 PM, Patrick McHardy <kaber@trash.net> wrote:
> On 14.11.2010 10:05, Changli Gao wrote:
>> As we own ct, 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>
>> ---
>> include/net/netfilter/nf_nat_core.h | 4 ++--
>> net/ipv4/netfilter/nf_nat_core.c | 4 ++--
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>> diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
>> index 33602ab..52ac1d8 100644
>> --- a/include/net/netfilter/nf_nat_core.h
>> +++ b/include/net/netfilter/nf_nat_core.h
>> @@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct,
>> enum nf_nat_manip_type manip)
>> {
>> if (manip == IP_NAT_MANIP_SRC)
>> - return test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);
>> + return IPS_SRC_NAT_DONE_BIT & ct->status;
>> else
>> - return test_bit(IPS_DST_NAT_DONE_BIT, &ct->status);
>> + return IPS_DST_NAT_DONE_BIT & ct->status;
>> }
>
> Looks fine, but I changed the order to ct->status & ...
>
Sorry, I made a mistake. The suffix _BIT should be removed.
--
Regards,
Changli Gao(xiaosuo@gmail.com)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-20 23:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-14 9:05 [PATCH] netfilter: don't use atomic bit operation Changli Gao
2010-11-15 10:59 ` Patrick McHardy
2010-11-20 23:40 ` Changli Gao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).