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

Commit 28c5ed2f authored by Taehee Yoo's avatar Taehee Yoo Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_flow_table: remove unnecessary nat flag check code 



nf_flow_offload_{ip/ipv6}_hook() check nat flag then, call
nf_flow_nat_{ip/ipv6} but that also check nat flag. so that
nat flag check code in nf_flow_offload_{ip/ipv6}_hook() are unnecessary.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b473a1f5

net/netfilter/nf_flow_table_ip.c

+2 −4
Original line number Diff line number Diff line
@@ -254,8 +254,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, 
	if (nf_flow_state_check(flow, ip_hdr(skb)->protocol, skb, thoff))

		return NF_ACCEPT;



	if (flow->flags & (FLOW_OFFLOAD_SNAT | FLOW_OFFLOAD_DNAT) &&

	    nf_flow_nat_ip(flow, skb, thoff, dir) < 0)

	if (nf_flow_nat_ip(flow, skb, thoff, dir) < 0)

		return NF_DROP;



	flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;
@@ -471,8 +470,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, 
	if (skb_try_make_writable(skb, sizeof(*ip6h)))

		return NF_DROP;



	if (flow->flags & (FLOW_OFFLOAD_SNAT | FLOW_OFFLOAD_DNAT) &&

	    nf_flow_nat_ipv6(flow, skb, dir) < 0)

	if (nf_flow_nat_ipv6(flow, skb, dir) < 0)

		return NF_DROP;



	flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;