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 /include | |
| parent | Revert "netfilter: nat: force port remap to prevent shadowing well-known ports" (diff) | |
| download | linux-ee0a4dc9f317fb9a97f20037d219802ca8de939b.tar.xz linux-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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 |
1 files changed, 0 insertions, 1 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) |