diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-04-07 19:48:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 14:15:19 -0700 |
| commit | bcc6d47903612c3861201cc3a866fb604f26b8b2 (patch) | |
| tree | bd02aeaa18984de46d09a1cb41b1f5e09ec89dbb /net/8021q/vlan.h | |
| parent | 143780c6562080c1117cd9197ee1b33c0d838376 (diff) | |
| download | linux-bcc6d47903612c3861201cc3a866fb604f26b8b2.tar.bz2 | |
net: vlan: make non-hw-accel rx path similar to hw-accel
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>
Diffstat (limited to 'net/8021q/vlan.h')
| -rw-r--r-- | net/8021q/vlan.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 5687c9b95f33..c3408def8a19 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -75,8 +75,6 @@ static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev) } /* found in vlan_dev.c */ -int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *ptype, struct net_device *orig_dev); void vlan_dev_set_ingress_priority(const struct net_device *dev, u32 skb_prio, u16 vlan_prio); int vlan_dev_set_egress_priority(const struct net_device *dev, |