| Message ID | 20210306121223.28711-2-pablo@netfilter.org |
|---|---|
| State | New |
| Headers | show |
| Series | Netfilter fixes for net | expand |
Hello: This series was applied to netdev/net.git (refs/heads/master): On Sat, 6 Mar 2021 13:12:15 +0100 you wrote: > From: "Dmitry V. Levin" <ldv@altlinux.org> > > Apparently, <linux/netfilter/nfnetlink_cthelper.h> and > <linux/netfilter/nfnetlink_acct.h> could not be included into the same > compilation unit because of a cut-and-paste typo in the former header. > > Fixes: 12f7a505331e6 ("netfilter: add user-space connection tracking helper infrastructure") > Cc: <stable@vger.kernel.org> # v3.6 > Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > [...] Here is the summary with links: - [net,1/9] uapi: nfnetlink_cthelper.h: fix userspace compilation error https://git.kernel.org/netdev/net/c/c33cb0020ee6 - [net,2/9] netfilter: conntrack: Remove a double space in a log message https://git.kernel.org/netdev/net/c/c57ea2d7d81f - [net,3/9] netfilter: nf_nat: undo erroneous tcp edemux lookup https://git.kernel.org/netdev/net/c/03a3ca37e4c6 - [net,4/9] netfilter: conntrack: avoid misleading 'invalid' in log message https://git.kernel.org/netdev/net/c/07b5a76e1892 - [net,5/9] selftests: netfilter: test nat port clash resolution interaction with tcp early demux https://git.kernel.org/netdev/net/c/c2c16ccba2f5 - [net,6/9] netfilter: x_tables: gpf inside xt_find_revision() https://git.kernel.org/netdev/net/c/8e24edddad15 - [net,7/9] netfilter: nftables: disallow updates on table ownership https://git.kernel.org/netdev/net/c/9cc0001a18b4 - [net,8/9] netfilter: nftables: fix possible double hook unregistration with table owner https://git.kernel.org/netdev/net/c/2888b080d05c - [net,9/9] netfilter: nftables: bogus check for netlink portID with table owner https://git.kernel.org/netdev/net/c/bd1777b3a88f You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/uapi/linux/netfilter/nfnetlink_cthelper.h b/include/uapi/linux/netfilter/nfnetlink_cthelper.h index a13137afc429..70af02092d16 100644 --- a/include/uapi/linux/netfilter/nfnetlink_cthelper.h +++ b/include/uapi/linux/netfilter/nfnetlink_cthelper.h @@ -5,7 +5,7 @@ #define NFCT_HELPER_STATUS_DISABLED 0 #define NFCT_HELPER_STATUS_ENABLED 1 -enum nfnl_acct_msg_types { +enum nfnl_cthelper_msg_types { NFNL_MSG_CTHELPER_NEW, NFNL_MSG_CTHELPER_GET, NFNL_MSG_CTHELPER_DEL,