Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter/IPVS updates for you net-next tree: 1) Missing NFTA_RULE_POSITION_ID netlink attribute validation, from Phil Sutter. 2) Restrict matching on tunnel metadata to rx/tx path, from wenxu. 3) Avoid indirect calls for IPV6=y, from Florian Westphal. 4) Add two indirections to prepare merger of IPV4 and IPV6 nat modules, from Florian Westphal. 5) Broken indentation in ctnetlink, from Colin Ian King. 6) Patches to use struct_size() from netfilter and IPVS, from Gustavo A. R. Silva. 7) Display kernel splat only once in case of racing to confirm conntrack from bridge plus nfqueue setups, from Chieh-Min Wang. 8) Skip checksum validation for layer 4 protocols that don't need it, patch from Alin Nastac. 9) Sparse warning due to symbol that should be static in CLUSTERIP, from Wei Yongjun. 10) Add new toggle to disable SDP payload translation when media endpoint is reachable though the same interface as the signalling peer, from Alin Nastac. ====================
Showing the changes to include/uapi/linux (1 of 22 files). Show all
Unified · Split
| @@ -1727,10 +1727,19 @@ enum nft_tunnel_keys { · 1726 unmodified lines | |||
| 1727 | }; | 1727 | }; |
| 1728 | #define NFT_TUNNEL_MAX (__NFT_TUNNEL_MAX - 1) | 1728 | #define NFT_TUNNEL_MAX (__NFT_TUNNEL_MAX - 1) |
| 1729 | 1729 | ||
| 1730 | enum nft_tunnel_mode { | ||
| 1731 | NFT_TUNNEL_MODE_NONE, | ||
| 1732 | NFT_TUNNEL_MODE_RX, | ||
| 1733 | NFT_TUNNEL_MODE_TX, | ||
| 1734 | __NFT_TUNNEL_MODE_MAX | ||
| 1735 | }; | ||
| 1736 | #define NFT_TUNNEL_MODE_MAX (__NFT_TUNNEL_MODE_MAX - 1) | ||
| 1737 | |||
| 1730 | enum nft_tunnel_attributes { | 1738 | enum nft_tunnel_attributes { |
| 1731 | NFTA_TUNNEL_UNSPEC, | 1739 | NFTA_TUNNEL_UNSPEC, |
| 1732 | NFTA_TUNNEL_KEY, | 1740 | NFTA_TUNNEL_KEY, |
| 1733 | NFTA_TUNNEL_DREG, | 1741 | NFTA_TUNNEL_DREG, |
| 1742 | NFTA_TUNNEL_MODE, | ||
| 1734 | __NFTA_TUNNEL_MAX | 1743 | __NFTA_TUNNEL_MAX |
| 1735 | }; | 1744 | }; |
| 1736 | #define NFTA_TUNNEL_MAX (__NFTA_TUNNEL_MAX - 1) | 1745 | #define NFTA_TUNNEL_MAX (__NFTA_TUNNEL_MAX - 1) |