Pablo Neira Ayuso says: ==================== 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. * git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next: netfilter: conntrack: use siphash_4u64 netfilter: rpfilter/fib: clean up some inconsistent indenting netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3() netfilter: nft_payload: use __be16 to store gre version ====================
Showing the changes to include/uapi (1 of 48 files). Show all
Unified · Split
| @@ -97,6 +97,7 @@ enum nft_verdicts { · 96 unmodified lines | ||
| 97 | 97 | * @NFT_MSG_NEWFLOWTABLE: add new flow table (enum nft_flowtable_attributes) |
| 98 | 98 | * @NFT_MSG_GETFLOWTABLE: get flow table (enum nft_flowtable_attributes) |
| 99 | 99 | * @NFT_MSG_DELFLOWTABLE: delete flow table (enum nft_flowtable_attributes) |
| 100 | + * @NFT_MSG_GETRULE_RESET: get rules and reset stateful expressions (enum nft_obj_attributes) | |
| 100 | 101 | */ |
| 101 | 102 | enum nf_tables_msg_types { |
| 102 | 103 | NFT_MSG_NEWTABLE, |
| @@ -124,6 +125,7 @@ enum nf_tables_msg_types { · 21 unmodified lines | ||
| 124 | 125 | NFT_MSG_NEWFLOWTABLE, |
| 125 | 126 | NFT_MSG_GETFLOWTABLE, |
| 126 | 127 | NFT_MSG_DELFLOWTABLE, |
| 128 | + NFT_MSG_GETRULE_RESET, | |
| 127 | 129 | NFT_MSG_MAX, |
| 128 | 130 | }; |
| 129 | 131 | |