diff options
author | 2023-10-11 17:37:57 -0700 | |
---|---|---|
committer | 2023-10-11 17:37:58 -0700 | |
commit | 21b2e2624d2ec69b831cd2edd202ca30ac6beae1 (patch) | |
tree | b66306043d29275eb3b15cf725d8c59157e67682 /drivers/net/macsec.c | |
parent | netdev: use napi_schedule bool instead of napi_schedule_prep/__napi_schedule (diff) | |
parent | netfilter: cleanup struct nft_table (diff) | |
download | wireguard-linux-21b2e2624d2ec69b831cd2edd202ca30ac6beae1.tar.xz wireguard-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 'drivers/net/macsec.c')
0 files changed, 0 insertions, 0 deletions