diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-06 17:02:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-06 17:02:40 -0800 |
| commit | 9270bbe258c8d1e22fadf4839e762ac937d1ec62 (patch) | |
| tree | 5e04ae69ac55eecea2ddeeddb74ebbd7f8e390f1 /include | |
| parent | a4dcfbc4ee2218abd567d81d795082d8d4afcdf6 (diff) | |
| parent | bd1777b3a88f98e223392221b330668458aac7f1 (diff) | |
| download | linux-stable-9270bbe258c8d1e22fadf4839e762ac937d1ec62.tar.gz linux-stable-9270bbe258c8d1e22fadf4839e762ac937d1ec62.tar.bz2 linux-stable-9270bbe258c8d1e22fadf4839e762ac937d1ec62.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix incorrect enum type definition in nfnetlink_cthelper UAPI,
from Dmitry V. Levin.
2) Remove extra space in deprecated automatic helper assignment
notice, from Klemen Košir.
3) Drop early socket demux socket after NAT mangling, from
Florian Westphal. Add a test to exercise this bug.
4) Fix bogus invalid packet report in the conntrack TCP tracker,
also from Florian.
5) Fix access to xt[NFPROTO_UNSPEC] list with no mutex
in target/match_revfn(), from Vasily Averin.
6) Disallow updates on the table ownership flag.
7) Fix double hook unregistration of tables with owner.
8) Remove bogus check on the table owner in __nft_release_tables().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_cthelper.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |