Commit 1a31f204 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

netsched: Allow meta match on vlan tag on receive

When vlan acceleration is used on receive, the vlan tag is maintained
outside of the skb data. The existing vlan tag match only works on TX
path because it uses vlan_get_tag which tests for VLAN_HW_TX_ACCEL.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1db9e29b
...@@ -176,8 +176,10 @@ META_COLLECTOR(var_dev) ...@@ -176,8 +176,10 @@ META_COLLECTOR(var_dev)
META_COLLECTOR(int_vlan_tag) META_COLLECTOR(int_vlan_tag)
{ {
unsigned short uninitialized_var(tag); unsigned short tag;
if (vlan_get_tag(skb, &tag) < 0)
tag = vlan_tx_tag_get(skb);
if (!tag && __vlan_get_tag(skb, &tag))
*err = -1; *err = -1;
else else
dst->value = tag; dst->value = tag;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment