Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[linux-2.6] / net / 8021q / vlan_core.c

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 85c94edb000ff9184b0a30e1f415448c4ba65568..916061f681b6484a95af7900311977fca7752ebc 100644 (file)
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -5,7 +5,7 @@
 
 /* VLAN rx hw acceleration helper.  This acts like netif_{rx,receive_skb}(). */
 int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
-                     unsigned short vlan_tag, int polling)
+                     u16 vlan_tci, int polling)
 {
        struct net_device_stats *stats;
 
@@ -14,7 +14,10 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                return NET_RX_DROP;
        }
 
-       skb->dev = vlan_group_get_device(grp, vlan_tag & VLAN_VID_MASK);
+       skb->vlan_tci = vlan_tci;
+       netif_nit_deliver(skb);
+
+       skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
        if (skb->dev == NULL) {
                dev_kfree_skb_any(skb);
                /* Not NET_RX_DROP, this is not being dropped
@@ -22,12 +25,13 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                return NET_RX_SUCCESS;
        }
        skb->dev->last_rx = jiffies;
+       skb->vlan_tci = 0;
 
        stats = &skb->dev->stats;
        stats->rx_packets++;
        stats->rx_bytes += skb->len;
 
-       skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tag);
+       skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
        switch (skb->pkt_type) {
        case PACKET_BROADCAST:
                break;
@@ -46,3 +50,15 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
        return (polling ? netif_receive_skb(skb) : netif_rx(skb));
 }
 EXPORT_SYMBOL(__vlan_hwaccel_rx);
+
+struct net_device *vlan_dev_real_dev(const struct net_device *dev)
+{
+       return vlan_dev_info(dev)->real_dev;
+}
+EXPORT_SYMBOL_GPL(vlan_dev_real_dev);
+
+u16 vlan_dev_vlan_id(const struct net_device *dev)
+{
+       return vlan_dev_info(dev)->vlan_id;
+}
+EXPORT_SYMBOL_GPL(vlan_dev_vlan_id);