diff options
-rw-r--r-- | include/linux/pkt_cls.h | 1 | ||||
-rw-r--r-- | net/sched/cls_flow.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index 7f6ba8658ab..defbde203d0 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h | |||
@@ -332,6 +332,7 @@ enum { | |||
332 | FLOW_KEY_SKUID, | 332 | FLOW_KEY_SKUID, |
333 | FLOW_KEY_SKGID, | 333 | FLOW_KEY_SKGID, |
334 | FLOW_KEY_VLAN_TAG, | 334 | FLOW_KEY_VLAN_TAG, |
335 | FLOW_KEY_RXHASH, | ||
335 | __FLOW_KEY_MAX, | 336 | __FLOW_KEY_MAX, |
336 | }; | 337 | }; |
337 | 338 | ||
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index cd709f1294d..5b271a18bc3 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
@@ -306,6 +306,11 @@ static u32 flow_get_vlan_tag(const struct sk_buff *skb) | |||
306 | return tag & VLAN_VID_MASK; | 306 | return tag & VLAN_VID_MASK; |
307 | } | 307 | } |
308 | 308 | ||
309 | static u32 flow_get_rxhash(struct sk_buff *skb) | ||
310 | { | ||
311 | return skb_get_rxhash(skb); | ||
312 | } | ||
313 | |||
309 | static u32 flow_key_get(struct sk_buff *skb, int key) | 314 | static u32 flow_key_get(struct sk_buff *skb, int key) |
310 | { | 315 | { |
311 | switch (key) { | 316 | switch (key) { |
@@ -343,6 +348,8 @@ static u32 flow_key_get(struct sk_buff *skb, int key) | |||
343 | return flow_get_skgid(skb); | 348 | return flow_get_skgid(skb); |
344 | case FLOW_KEY_VLAN_TAG: | 349 | case FLOW_KEY_VLAN_TAG: |
345 | return flow_get_vlan_tag(skb); | 350 | return flow_get_vlan_tag(skb); |
351 | case FLOW_KEY_RXHASH: | ||
352 | return flow_get_rxhash(skb); | ||
346 | default: | 353 | default: |
347 | WARN_ON(1); | 354 | WARN_ON(1); |
348 | return 0; | 355 | return 0; |