On Mon, Nov 15, 2010 at 6:59 PM, Patrick McHardy <kaber@trash.net> wrote:
quoted text
> 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 netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html