diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2022-03-17 13:56:06 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2022-03-17 13:56:58 -0700 |
| commit | e243f39685af1bd6d837fa7bff40c1afdf3eb7fa (patch) | |
| tree | 61e9d9b74a0814f950a693ebe8061293e4960b1e /include/net/netfilter | |
| parent | selftests: net: fix array_size.cocci warning (diff) | |
| parent | Merge tag 'net-5.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/n... (diff) | |
| download | linux-e243f39685af1bd6d837fa7bff40c1afdf3eb7fa.tar.gz linux-e243f39685af1bd6d837fa7bff40c1afdf3eb7fa.tar.bz2 linux-e243f39685af1bd6d837fa7bff40c1afdf3eb7fa.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/netfilter')
| -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) |