Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains the first batch of Netfilter updates for your net-next tree. 1) Define pr_fmt() in nf_conntrack, from Weongyo Jeong. 2) Define and register netfilter's afinfo for the bridge family, this comes in preparation for native nfqueue's bridge for nft, from Stephane Bryant. 3) Add new attributes to store layer 2 and VLAN headers to nfqueue, also from Stephane Bryant. 4) Parse new NFQA_VLAN and NFQA_L2HDR nfqueue netlink attributes coming from userspace, from Stephane Bryant. 5) Use net->ipv6.devconf_all->hop_limit instead of hardcoded hop_limit in IPv6 SYNPROXY, from Liping Zhang. 6) Remove unnecessary check for dst == NULL in nf_reject_ipv6, from Haishuang Yan. 7) Deinline ctnetlink event report functions, from Florian Westphal. ====================
Showing the changes to include/uapi (1 of 8 files). Show all
Unified · Split
| @@ -30,6 +30,14 @@ struct nfqnl_msg_packet_timestamp { · 29 unmodified lines | |||
| 30 | __aligned_be64 usec; | 30 | __aligned_be64 usec; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | enum nfqnl_vlan_attr { | ||
| 34 | NFQA_VLAN_UNSPEC, | ||
| 35 | NFQA_VLAN_PROTO, /* __be16 skb vlan_proto */ | ||
| 36 | NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */ | ||
| 37 | __NFQA_VLAN_MAX, | ||
| 38 | }; | ||
| 39 | #define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1) | ||
| 40 | |||
| 33 | enum nfqnl_attr_type { | 41 | enum nfqnl_attr_type { |
| 34 | NFQA_UNSPEC, | 42 | NFQA_UNSPEC, |
| 35 | NFQA_PACKET_HDR, | 43 | NFQA_PACKET_HDR, |
| @@ -50,6 +58,8 @@ enum nfqnl_attr_type { · 14 unmodified lines | |||
| 50 | NFQA_UID, /* __u32 sk uid */ | 58 | NFQA_UID, /* __u32 sk uid */ |
| 51 | NFQA_GID, /* __u32 sk gid */ | 59 | NFQA_GID, /* __u32 sk gid */ |
| 52 | NFQA_SECCTX, /* security context string */ | 60 | NFQA_SECCTX, /* security context string */ |
| 61 | NFQA_VLAN, /* nested attribute: packet vlan info */ | ||
| 62 | NFQA_L2HDR, /* full L2 header */ | ||
| 53 | 63 | ||
| 54 | __NFQA_MAX | 64 | __NFQA_MAX |
| 55 | }; | 65 | }; |