History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter/IPVS updates for net-next: 1) Add support to specify a stateful expression in set definitions, this allows users to specify e.g. counters per set elements. 2) Flowtable software counter support. 3) Flowtable hardware offload counter support, from wenxu. 3) Parallelize flowtable hardware offload requests, from Paul Blakey. This includes a patch to add one work entry per offload command. 4) Several patches to rework nf_queue refcount handling, from Florian Westphal. 4) A few fixes for the flowtable tunnel offload: Fix crash if tunneling information is missing and set up indirect flow block as TC_SETUP_FT, patch from wenxu. 5) Stricter netlink attribute sanity check on filters, from Romain Bellan and Florent Fourcot. 5) Annotations to make sparse happy, from Jules Irenge. 6) Improve icmp errors in debugging information, from Haishuang Yan. 7) Fix warning in IPVS icmp error debugging, from Haishuang Yan. 8) Fix endianess issue in tcp extension header, from Sergey Marinkevich. ====================

David S. Miller committed 6 years ago

Commit d9679cd2 parents 6fe9a94 e19680f21 files · +280 −198Browse files

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

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+15−0
@@ -342,6 +342,7 @@ enum nft_set_field_attributes { · 341 unmodified lines
342342 * @NFTA_SET_USERDATA: user data (NLA_BINARY)
343343 * @NFTA_SET_OBJ_TYPE: stateful object type (NLA_U32: NFT_OBJECT_*)
344344 * @NFTA_SET_HANDLE: set handle (NLA_U64)
345+ * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)
345346 */
346347 enum nft_set_attributes {
347348 NFTA_SET_UNSPEC,
@@ -361,6 +362,7 @@ enum nft_set_attributes { · 13 unmodified lines
361362 NFTA_SET_PAD,
362363 NFTA_SET_OBJ_TYPE,
363364 NFTA_SET_HANDLE,
365+ NFTA_SET_EXPR,
364366 __NFTA_SET_MAX
365367 };
366368 #define NFTA_SET_MAX (__NFTA_SET_MAX - 1)
@@ -1551,6 +1553,19 @@ enum nft_object_attributes { · 1184 unmodified lines
15511553 };
15521554 #define NFTA_OBJ_MAX (__NFTA_OBJ_MAX - 1)
15531555
1556+/**
1557+ * enum nft_flowtable_flags - nf_tables flowtable flags
1558+ *
1559+ * @NFT_FLOWTABLE_HW_OFFLOAD: flowtable hardware offload is enabled
1560+ * @NFT_FLOWTABLE_COUNTER: enable flow counters
1561+ */
1562+enum nft_flowtable_flags {
1563+ NFT_FLOWTABLE_HW_OFFLOAD = 0x1,
1564+ NFT_FLOWTABLE_COUNTER = 0x2,
1565+ NFT_FLOWTABLE_MASK = (NFT_FLOWTABLE_HW_OFFLOAD |
1566+ NFT_FLOWTABLE_COUNTER)
1567+};
1568+
15541569 /**
15551570 * enum nft_flowtable_attributes - nf_tables flow table netlink attributes
15561571 *

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t