* [PATCH] netsched: Allow meta match on vlan tag on receive
@ 2009-04-14 0:30 Stephen Hemminger
2009-04-14 1:13 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2009-04-14 0:30 UTC (permalink / raw)
To: Patrick McHardy, David Miller, Thomas Graf; +Cc: netdev
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>
--- a/net/sched/em_meta.c 2009-04-08 08:45:13.000000000 -0700
+++ b/net/sched/em_meta.c 2009-04-09 09:26:32.397494374 -0700
@@ -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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] netsched: Allow meta match on vlan tag on receive
2009-04-14 0:30 [PATCH] netsched: Allow meta match on vlan tag on receive Stephen Hemminger
@ 2009-04-14 1:13 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-04-14 1:13 UTC (permalink / raw)
To: shemminger; +Cc: kaber, tgraf, netdev
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 13 Apr 2009 17:30:08 -0700
> 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>
Looks good, applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-14 1:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-14 0:30 [PATCH] netsched: Allow meta match on vlan tag on receive Stephen Hemminger
2009-04-14 1:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox