History

Merge tag 'nf-next-25-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next

Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following batch contains Netfilter updates for net-next: 1) Replace msecs_to_jiffies() by secs_to_jiffies(), from Easwar Hariharan. 2) Allow to compile xt_cgroup with cgroupsv2 support only, from Michal Koutny. 3) Prepare for sock_cgroup_classid() removal by wrapping it around ifdef, also from Michal Koutny. 4) Remove redundant pointer fetch on conntrack template, from Xuanqiang Luo. 5) Re-format one block in the tproxy documentation for consistency, from Chen Linxuan. 6) Expose set element count and type via netlink attributes, from Florian Westphal. * tag 'nf-next-25-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next: netfilter: nf_tables: export set count and backend name to userspace docs: tproxy: fix formatting for nft code block netfilter: conntrack: Remove redundant NFCT_ALIGN call net: cgroup: Guard users of sock_cgroup_classid() netfilter: xt_cgroup: Make it independent from net_cls netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies() ====================

Jakub Kicinski committed 1 year ago

Commit 1f773972 parents 8e36fca 0014af88 files · +67 −13Browse files

Showing the changes to include/uapi/linux (1 of 8 files). Show all

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+4−0
@@ -394,6 +394,8 @@ enum nft_set_field_attributes { · 393 unmodified lines
394 * @NFTA_SET_HANDLE: set handle (NLA_U64)394 * @NFTA_SET_HANDLE: set handle (NLA_U64)
395 * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)395 * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)
396 * @NFTA_SET_EXPRESSIONS: list of expressions (NLA_NESTED: nft_list_attributes)396 * @NFTA_SET_EXPRESSIONS: list of expressions (NLA_NESTED: nft_list_attributes)
397 * @NFTA_SET_TYPE: set backend type (NLA_STRING)
398 * @NFTA_SET_COUNT: number of set elements (NLA_U32)
397 */399 */
398enum nft_set_attributes {400enum nft_set_attributes {
399 NFTA_SET_UNSPEC,401 NFTA_SET_UNSPEC,
@@ -415,6 +417,8 @@ enum nft_set_attributes { · 15 unmodified lines
415 NFTA_SET_HANDLE,417 NFTA_SET_HANDLE,
416 NFTA_SET_EXPR,418 NFTA_SET_EXPR,
417 NFTA_SET_EXPRESSIONS,419 NFTA_SET_EXPRESSIONS,
420 NFTA_SET_TYPE,
421 NFTA_SET_COUNT,
418 __NFTA_SET_MAX422 __NFTA_SET_MAX
419};423};
420#define NFTA_SET_MAX (__NFTA_SET_MAX - 1)424#define NFTA_SET_MAX (__NFTA_SET_MAX - 1)