Commit 1a31f204 authored Apr 13, 2009 by Stephen Hemminger Committed by David S. Miller Apr 13, 2009

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: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1db9e29b

net/sched/em_meta.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -176,8 +176,10 @@ META_COLLECTOR(var_dev)

		META_COLLECTOR(int_vlan_tag)
		{
		unsigned short uninitialized_var(tag);
		if (vlan_get_tag(skb, &tag) < 0)
		unsigned short tag;

		tag = vlan_tx_tag_get(skb);
		if (!tag && __vlan_get_tag(skb, &tag))
		*err = -1;
		else
		dst->value = tag;