Commit ee0a4dc9 authored by Florian Westphal's avatar Florian Westphal
Browse files

Revert "netfilter: conntrack: tag conntracks picked up in local out hook" 



This was a prerequisite for the ill-fated
"netfilter: nat: force port remap to prevent shadowing well-known ports".

As this has been reverted, this change can be backed out too.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent a82c25c3

include/net/netfilter/nf_conntrack.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct nf_conn { 
	unsigned long status;



	u16		cpu;

	u16		local_origin:1;

	possible_net_t ct_net;



#if IS_ENABLED(CONFIG_NF_NAT)

net/netfilter/nf_conntrack_core.c

+0 −3
Original line number Diff line number Diff line
@@ -1748,9 +1748,6 @@ resolve_normal_ct(struct nf_conn *tmpl, 
			return 0;

		if (IS_ERR(h))

			return PTR_ERR(h);



		ct = nf_ct_tuplehash_to_ctrack(h);

		ct->local_origin = state->hook == NF_INET_LOCAL_OUT;

	}

	ct = nf_ct_tuplehash_to_ctrack(h);