Netfilter updates for net-next
Status from this message: This series was applied to netdev/net-next.git (master)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest6 patches 0 repliesApplied 6/6
- v16 patches 3 repliesSuperseded
Patches in v2 All 6 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | netfilter: nft_payload: use __be16 to store gre versionnet/ | +2 | 0 replies | Applied |
| 2/6 | netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3()net/ | +1 | 0 replies | Applied |
| 3/6 | netfilter: nf_tables: Extend nft_expr_ops::dump callback parametersinclude/ include/ include/ +42 more | +110 | 0 replies | Applied |
| 4/6 | netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESETinclude/ include/ net/ +4 more | +41 | 0 replies | Applied |
| 5/6 | netfilter: rpfilter/fib: clean up some inconsistent indentingnet/ | +2 | 0 replies | Applied |
| 6/6 | netfilter: conntrack: use siphash_4u64net/ | +13 | 0 replies | Applied |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH net-next,v2 0/6] Netfilter updates for net-next
Hi,
The following patchset contains Netfilter updates for net-next:
1) Fix sparse warning in the new nft_inner expression, reported by Jakub Kicinski.
2) Incorrect vlan header check in nft_inner, from Peng Wu.
3) Two patches to pass reset boolean to expression dump operation, in preparation for allowing to reset stateful expressions in rules. This adds a new NFT_MSG_GETRULE_RESET command. From Phil Sutter.
4) Inconsistent indentation in nft_fib, from Jiapeng Chong.
5) Speed up siphash calculation in conntrack, from Florian Westphal.
This batch includes two fixes for the new inner payload/meta match coming in the previous nf-next pull request.
Coming in this v2 after Jakub's comments:
- sparse looks now clean after siphash conntrack update.
- no more bisectability breakage in new NFT_MSG_GETRULE_RESET command.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
Thanks.
----------------------------------------------------------------
The following changes since commit 6f1a298b2e24c703bfcc643e41bc7c0604fe4830:
Merge branch 'inet-add-drop-monitor-support' (2022-10-31 20:14:30 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git HEAD
for you to fetch changes up to d2c806abcf0b582131e1f93589d628dac0c07bf4:
netfilter: conntrack: use siphash_4u64 (2022-11-15 10:53:19 +0100)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: conntrack: use siphash_4u64
Jiapeng Chong (1):
netfilter: rpfilter/fib: clean up some inconsistent indenting
Pablo Neira Ayuso (1):
netfilter: nft_payload: use __be16 to store gre version
Peng Wu (1):
netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3()
Phil Sutter (2):
netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters
netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET
include/net/netfilter/nf_tables.h | 5 ++-- include/net/netfilter/nft_fib.h | 2 +- include/net/netfilter/nft_meta.h | 4 +-- include/net/netfilter/nft_reject.h | 3 +- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/ipv4/netfilter/nft_dup_ipv4.c | 3 +- net/ipv4/netfilter/nft_fib_ipv4.c | 5 ++-- net/ipv6/netfilter/nft_dup_ipv6.c | 3 +- net/netfilter/nf_conntrack_core.c | 30 +++++++++---------- net/netfilter/nf_tables_api.c | 49 +++++++++++++++++++++----------- net/netfilter/nft_bitwise.c | 6 ++-- net/netfilter/nft_byteorder.c | 3 +- net/netfilter/nft_cmp.c | 9 ++++-- net/netfilter/nft_compat.c | 9 ++++-- net/netfilter/nft_connlimit.c | 3 +- net/netfilter/nft_counter.c | 5 ++-- net/netfilter/nft_ct.c | 6 ++-- net/netfilter/nft_dup_netdev.c | 3 +- net/netfilter/nft_dynset.c | 7 +++-- net/netfilter/nft_exthdr.c | 9 ++++-- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_flow_offload.c | 3 +- net/netfilter/nft_fwd_netdev.c | 6 ++-- net/netfilter/nft_hash.c | 4 +-- net/netfilter/nft_immediate.c | 3 +- net/netfilter/nft_inner.c | 7 +++-- net/netfilter/nft_last.c | 3 +- net/netfilter/nft_limit.c | 5 ++-- net/netfilter/nft_log.c | 3 +- net/netfilter/nft_lookup.c | 3 +- net/netfilter/nft_masq.c | 3 +- net/netfilter/nft_meta.c | 5 ++-- net/netfilter/nft_nat.c | 3 +- net/netfilter/nft_numgen.c | 6 ++-- net/netfilter/nft_objref.c | 6 ++-- net/netfilter/nft_osf.c | 3 +- net/netfilter/nft_payload.c | 9 ++++-- net/netfilter/nft_queue.c | 6 ++-- net/netfilter/nft_quota.c | 5 ++-- net/netfilter/nft_range.c | 3 +- net/netfilter/nft_redir.c | 3 +- net/netfilter/nft_reject.c | 3 +- net/netfilter/nft_rt.c | 2 +- net/netfilter/nft_socket.c | 2 +- net/netfilter/nft_synproxy.c | 3 +- net/netfilter/nft_tproxy.c | 2 +- net/netfilter/nft_tunnel.c | 2 +- net/netfilter/nft_xfrm.c | 2 +- 48 files changed, 168 insertions(+), 105 deletions(-)