diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-10-11 17:37:57 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-10-11 17:37:58 -0700 |
commit | 21b2e2624d2ec69b831cd2edd202ca30ac6beae1 (patch) | |
tree | b66306043d29275eb3b15cf725d8c59157e67682 /net/ipv4/tcp_output.c | |
parent | d1fea38f01acbd6bc6d0f919ecb56d5f57ccaa12 (diff) | |
parent | 94ecde833be5779f8086c3a094dfa51e1dbce75f (diff) | |
download | linux-21b2e2624d2ec69b831cd2edd202ca30ac6beae1.tar.gz linux-21b2e2624d2ec69b831cd2edd202ca30ac6beae1.tar.bz2 linux-21b2e2624d2ec69b831cd2edd202ca30ac6beae1.zip |
Merge tag 'nf-next-23-10-10' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
Florian Westphal says:
====================
netfilter updates for next
First 5 patches, from Phil Sutter, clean up nftables dumpers to
use the context buffer in the netlink_callback structure rather
than a kmalloc'd buffer.
Patch 6, from myself, zaps dead code and replaces the helper function
with a small inlined helper.
Patch 7, also from myself, removes another pr_debug and replaces it
with the existing nf_log-based debug helpers.
Last patch, from George Guo, gets nft_table comments back in
sync with the structure members.
* tag 'nf-next-23-10-10' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
netfilter: cleanup struct nft_table
netfilter: conntrack: prefer tcp_error_log to pr_debug
netfilter: conntrack: simplify nf_conntrack_alter_reply
netfilter: nf_tables: Don't allocate nft_rule_dump_ctx
netfilter: nf_tables: Carry s_idx in nft_rule_dump_ctx
netfilter: nf_tables: Carry reset flag in nft_rule_dump_ctx
netfilter: nf_tables: Drop pointless memset when dumping rules
netfilter: nf_tables: Always allocate nft_rule_dump_ctx
====================
Link: https://lore.kernel.org/r/20231010145343.12551-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions