diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-16 03:27:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-16 03:28:09 +0300 |
| commit | faef091c5a930a75586ebcb089ee9ad7c1eedaf3 (patch) | |
| tree | 9c966fae0dbce192db5b9de411a70315d4f30eb7 /include | |
| parent | 0ca4e20ba3de1a1077ee36df22176c2055497923 (diff) | |
| parent | 37a6c1512314d2439ef7136d773d5a470e0996b9 (diff) | |
| download | linux-faef091c5a930a75586ebcb089ee9ad7c1eedaf3.tar.xz | |
Merge branch 'cls_flower-port-masks'
Or Gerlitz says:
====================
net/sched: cls_flower: Add ports masks
This series adds the ability to specify tcp/udp ports masks
for TC/flower filter matches.
I also removed an unused fields from the flower keys struct
and clarified the format of the recently added vlan attibutes.
v1--> v2 changes:
* fixes typo in patch #2 title and change log (Sergei)
* added acks provided by Jiri on v1
FWIW, by mistake the cover letter of V1 (but not the patches)
carried V2 tag, hope this doesn't create too much confusion.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/pkt_cls.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index f9c287c67eae..8915b61bbf83 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -428,9 +428,9 @@ enum { TCA_FLOWER_KEY_UDP_DST, /* be16 */ TCA_FLOWER_FLAGS, - TCA_FLOWER_KEY_VLAN_ID, - TCA_FLOWER_KEY_VLAN_PRIO, - TCA_FLOWER_KEY_VLAN_ETH_TYPE, + TCA_FLOWER_KEY_VLAN_ID, /* be16 */ + TCA_FLOWER_KEY_VLAN_PRIO, /* u8 */ + TCA_FLOWER_KEY_VLAN_ETH_TYPE, /* be16 */ TCA_FLOWER_KEY_ENC_KEY_ID, /* be32 */ TCA_FLOWER_KEY_ENC_IPV4_SRC, /* be32 */ @@ -442,6 +442,10 @@ enum { TCA_FLOWER_KEY_ENC_IPV6_DST, /* struct in6_addr */ TCA_FLOWER_KEY_ENC_IPV6_DST_MASK,/* struct in6_addr */ + TCA_FLOWER_KEY_TCP_SRC_MASK, /* be16 */ + TCA_FLOWER_KEY_TCP_DST_MASK, /* be16 */ + TCA_FLOWER_KEY_UDP_SRC_MASK, /* be16 */ + TCA_FLOWER_KEY_UDP_DST_MASK, /* be16 */ __TCA_FLOWER_MAX, }; |