netfilter: ipvs: don't check for presence of nat extension

PATCH Applied Florian Westphal 2 participants 2 messages Mar 28, 2017 – Mar 30, 2017

Subsystems (3)

Networking netfilter IPVS

lore

Share & tools

lore

Florian Westphal

author maintainer

2017-03-28 08:31 UTC #0 lore raw

PATCH 1/1 netfilter: ipvs: don't check for presence of nat extension

Check for the NAT status bits, they are set once conntrack needs NAT in source or reply direction, this is slightly faster than nfct_nat() as that has to check the extension area.

Signed-off-by Florian Westphal <[email protected]>

---
 net/netfilter/ipvs/ip_vs_ftp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

net/netfilter/ipvs/ip_vs_ftp.c +1 -1

index d30c327bb578..2e2bf7428cd1 100644
@@ -260,7 +260,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
 		buf_len = strlen(buf);
 
 		ct = nf_ct_get(skb, &ctinfo);
-		if (ct && !nf_ct_is_untracked(ct) && nfct_nat(ct)) {
+		if (ct && !nf_ct_is_untracked(ct) && (ct->status & IPS_NAT_MASK)) {
 			/* If mangling fails this function will return 0
 			 * which will cause the packet to be dropped.
 			 * Mangling can only fail under memory pressure,

Signature · 1 line

2.10.2

Simon Horman

maintainer Applied

2017-03-30 12:42 UTC #1 lore raw

Quoted 5 lines · Florian Westphal

Check for the NAT status bits, they are set once conntrack needs NAT in source or reply direction, this is slightly faster than nfct_nat() as that has to check the extension area.
Signed-off-by Florian Westphal <[email protected]>

Thanks, applied.