Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/net/netfilter/nf_nat_core.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/ipv4/netfilter/nf_nat_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}