diff options
| author |   Florian Westphal <fw@strlen.de> | 2022-03-08 17:28:38 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2022-03-08 17:28:38 +0100 |
| commit | ee0a4dc9f317fb9a97f20037d219802ca8de939b (patch) | |
| tree | 8c5c2f62b1ff323ef43b74244d8ddfeb12195831 | |
| parent | Revert "netfilter: nat: force port remap to prevent shadowing well-known ports" (diff) | |
| download | linux-dev-ee0a4dc9f317fb9a97f20037d219802ca8de939b.tar.xz linux-dev-ee0a4dc9f317fb9a97f20037d219802ca8de939b.zip | |
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>
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 8731d5bcb47d..b08b70989d2c 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -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) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index d6aa5b47031e..bf1e17c678f1 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -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); |