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: Changli Gao <xiaosuo@gmail.com>
Cc: Tim Gardner <tim.gardner@canonical.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
index 5aec85c29979ff636a30ac095c6e11bccccdd1c4..3dc7b98effebd49e9079e25c458a479c2448f59a 100644 (file)
--- 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 ct->status & IPS_SRC_NAT_DONE_BIT;
+               return ct->status & IPS_SRC_NAT_DONE;
        else
-               return ct->status & IPS_DST_NAT_DONE_BIT;
+               return ct->status & IPS_DST_NAT_DONE;
 }
 
 struct nlattr;

diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index 6972ceee99c61f81342279a04b55d42dba667312..3002c0492fb04b63cb557abd5f5891373de38889 100644 (file)
--- 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)
-               ct->status |= IPS_DST_NAT_DONE_BIT;
+               ct->status |= IPS_DST_NAT_DONE;
        else
-               ct->status |= IPS_SRC_NAT_DONE_BIT;
+               ct->status |= IPS_SRC_NAT_DONE;
 
        return NF_ACCEPT;
 }