net: vlan: make non-hw-accel rx path similar to hw-accel

Browse source

Now there are 2 paths for rx vlan frames. When rx-vlan-hw-accel is
enabled, skb is untagged by NIC, vlan_tci is set and the skb gets into
vlan code in __netif_receive_skb - vlan_hwaccel_do_receive.

For non-rx-vlan-hw-accel however, tagged skb goes thru whole
__netif_receive_skb, it's untagged in ptype_base hander and reinjected

This incosistency is fixed by this patch. Vlan untagging happens early in
__netif_receive_skb so the rest of code (ptype_all handlers, rx_handlers)
see the skb like it was untagged by hw.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>

v1->v2:
	remove "inline" from vlan_core.c functions
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Jiri Pirko 2011-04-07 19:48:33 +00:00 • committed by David S. Miller

parent 143780c656

commit bcc6d47903

6 changed files with 99 additions and 187 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/linux/if_vlan.h

View file

8

net/8021q/vlan.c

View file

2

net/8021q/vlan.h

View file

85

net/8021q/vlan_core.c

View file

173

net/8021q/vlan_dev.c

View file

8

net/core/dev.c

View file