Commit a7c2f4d7 authored by Changli Gao's avatar Changli Gao Committed by Patrick McHardy

netfilter: nf_nat: fix conversion to non-atomic bit ops

My previous patch (netfilter: nf_nat: don't use atomic bit operation)
made a mistake when converting atomic_set to a normal bit 'or'.
IPS_*_BIT should be replaced with IPS_*.
Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Cc: Tim Gardner <tim.gardner@canonical.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent fbabf31e
...@@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct, ...@@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct,
enum nf_nat_manip_type manip) enum nf_nat_manip_type manip)
{ {
if (manip == IP_NAT_MANIP_SRC) if (manip == IP_NAT_MANIP_SRC)
return ct->status & IPS_SRC_NAT_DONE_BIT; return ct->status & IPS_SRC_NAT_DONE;
else else
return ct->status & IPS_DST_NAT_DONE_BIT; return ct->status & IPS_DST_NAT_DONE;
} }
struct nlattr; struct nlattr;
......
...@@ -323,9 +323,9 @@ nf_nat_setup_info(struct nf_conn *ct, ...@@ -323,9 +323,9 @@ nf_nat_setup_info(struct nf_conn *ct,
/* It's done. */ /* It's done. */
if (maniptype == IP_NAT_MANIP_DST) if (maniptype == IP_NAT_MANIP_DST)
ct->status |= IPS_DST_NAT_DONE_BIT; ct->status |= IPS_DST_NAT_DONE;
else else
ct->status |= IPS_SRC_NAT_DONE_BIT; ct->status |= IPS_SRC_NAT_DONE;
return NF_ACCEPT; return NF_ACCEPT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment