Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git] / net / 8021q / vlan_core.c
1 #include <linux/skbuff.h>
2 #include <linux/netdevice.h>
3 #include <linux/if_vlan.h>
4 #include "vlan.h"
5
6 /* VLAN rx hw acceleration helper.  This acts like netif_{rx,receive_skb}(). */
7 int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
8                       u16 vlan_tci, int polling)
9 {
10         struct net_device_stats *stats;
11
12         if (skb_bond_should_drop(skb)) {
13                 dev_kfree_skb_any(skb);
14                 return NET_RX_DROP;
15         }
16
17         skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
18         if (skb->dev == NULL) {
19                 dev_kfree_skb_any(skb);
20                 /* Not NET_RX_DROP, this is not being dropped
21                  * due to congestion. */
22                 return NET_RX_SUCCESS;
23         }
24         skb->dev->last_rx = jiffies;
25
26         stats = &skb->dev->stats;
27         stats->rx_packets++;
28         stats->rx_bytes += skb->len;
29
30         skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
31         switch (skb->pkt_type) {
32         case PACKET_BROADCAST:
33                 break;
34         case PACKET_MULTICAST:
35                 stats->multicast++;
36                 break;
37         case PACKET_OTHERHOST:
38                 /* Our lower layer thinks this is not local, let's make sure.
39                  * This allows the VLAN to have a different MAC than the
40                  * underlying device, and still route correctly. */
41                 if (!compare_ether_addr(eth_hdr(skb)->h_dest,
42                                         skb->dev->dev_addr))
43                         skb->pkt_type = PACKET_HOST;
44                 break;
45         };
46         return (polling ? netif_receive_skb(skb) : netif_rx(skb));
47 }
48 EXPORT_SYMBOL(__vlan_hwaccel_rx);
49
50 struct net_device *vlan_dev_real_dev(const struct net_device *dev)
51 {
52         return vlan_dev_info(dev)->real_dev;
53 }
54 EXPORT_SYMBOL_GPL(vlan_dev_real_dev);
55
56 u16 vlan_dev_vlan_id(const struct net_device *dev)
57 {
58         return vlan_dev_info(dev)->vlan_id;
59 }
60 EXPORT_SYMBOL_GPL(vlan_dev_vlan_id);