mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
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: Florian Westphal <fw@strlen.de>
This commit is contained in:
parent
a82c25c366
commit
ee0a4dc9f3
2 changed files with 0 additions and 4 deletions
|
@ -97,7 +97,6 @@ struct nf_conn {
|
||||||
unsigned long status;
|
unsigned long status;
|
||||||
|
|
||||||
u16 cpu;
|
u16 cpu;
|
||||||
u16 local_origin:1;
|
|
||||||
possible_net_t ct_net;
|
possible_net_t ct_net;
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_NF_NAT)
|
#if IS_ENABLED(CONFIG_NF_NAT)
|
||||||
|
|
|
@ -1748,9 +1748,6 @@ resolve_normal_ct(struct nf_conn *tmpl,
|
||||||
return 0;
|
return 0;
|
||||||
if (IS_ERR(h))
|
if (IS_ERR(h))
|
||||||
return PTR_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);
|
ct = nf_ct_tuplehash_to_ctrack(h);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue