Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for your net-next tree: 1) Use lockdep_is_held() in ipset_dereference_protected(), from Lance Roy. 2) Remove unused variable in cttimeout, from YueHaibing. 3) Add ttl option for nft_osf, from Fernando Fernandez Mancera. 4) Use xfrm family to deal with IPv6-in-IPv4 packets from nft_xfrm, from Florian Westphal. 5) Simplify xt_osf_match_packet(). 6) Missing ct helper alias definition in snmp_trap helper, from Taehee Yoo. 7) Remove unnecessary parameter in nf_flow_table_cleanup(), from Taehee Yoo. 8) Remove unused variable definitions in nft_{dup,fwd}, from Weongyo Jeong. 9) Remove empty net/netfilter/nfnetlink_log.h file, from Taehee Yoo. 10) Revert xt_quota updates remain option due to problems in the listing path for 32-bit arches, from Maze. ====================
Showing the changes to include/uapi/linux (2 of 17 files). Show all
Unified · Split
| @@ -1511,9 +1511,16 @@ enum nft_flowtable_hook_attributes { · 1510 unmodified lines | |||
| 1511 | }; | 1511 | }; |
| 1512 | #define NFTA_FLOWTABLE_HOOK_MAX (__NFTA_FLOWTABLE_HOOK_MAX - 1) | 1512 | #define NFTA_FLOWTABLE_HOOK_MAX (__NFTA_FLOWTABLE_HOOK_MAX - 1) |
| 1513 | 1513 | ||
| 1514 | /** | ||
| 1515 | * enum nft_osf_attributes - nftables osf expression netlink attributes | ||
| 1516 | * | ||
| 1517 | * @NFTA_OSF_DREG: destination register (NLA_U32: nft_registers) | ||
| 1518 | * @NFTA_OSF_TTL: Value of the TTL osf option (NLA_U8) | ||
| 1519 | */ | ||
| 1514 | enum nft_osf_attributes { | 1520 | enum nft_osf_attributes { |
| 1515 | NFTA_OSF_UNSPEC, | 1521 | NFTA_OSF_UNSPEC, |
| 1516 | NFTA_OSF_DREG, | 1522 | NFTA_OSF_DREG, |
| 1523 | NFTA_OSF_TTL, | ||
| 1517 | __NFTA_OSF_MAX, | 1524 | __NFTA_OSF_MAX, |
| 1518 | }; | 1525 | }; |
| 1519 | #define NFTA_OSF_MAX (__NFTA_OSF_MAX - 1) | 1526 | #define NFTA_OSF_MAX (__NFTA_OSF_MAX - 1) |
| @@ -15,11 +15,9 @@ struct xt_quota_info { · 14 unmodified lines | |||
| 15 | __u32 flags; | 15 | __u32 flags; |
| 16 | __u32 pad; | 16 | __u32 pad; |
| 17 | __aligned_u64 quota; | 17 | __aligned_u64 quota; |
| 18 | #ifdef __KERNEL__ | 18 | |
| 19 | atomic64_t counter; | 19 | /* Used internally by the kernel */ |
| 20 | #else | 20 | struct xt_quota_priv *master; |
| 21 | __aligned_u64 remain; | ||
| 22 | #endif | ||
| 23 | }; | 21 | }; |
| 24 | 22 | ||
| 25 | #endif /* _XT_QUOTA_H */ | 23 | #endif /* _XT_QUOTA_H */ |