]> bbs.cooldavid.org Git - net-next-2.6.git/blame - net/8021q/vlan_core.c
net: deliver skbs on inactive slaves to exact matches
[net-next-2.6.git] / net / 8021q / vlan_core.c
CommitLineData
7750f403
PM
1#include <linux/skbuff.h>
2#include <linux/netdevice.h>
3#include <linux/if_vlan.h>
4ead4431 4#include <linux/netpoll.h>
7750f403
PM
5#include "vlan.h"
6
7/* VLAN rx hw acceleration helper. This acts like netif_{rx,receive_skb}(). */
8int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
9bb8582e 9 u16 vlan_tci, int polling)
7750f403 10{
4ead4431
HX
11 if (netpoll_rx(skb))
12 return NET_RX_DROP;
13
0641e4fb 14 if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
597a264b 15 skb->deliver_no_wcard = 1;
7750f403 16
1f3c8804 17 skb->skb_iif = skb->dev->ifindex;
b93ab837 18 __vlan_hwaccel_put_tag(skb, vlan_tci);
e1c096e2
HX
19 skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
20
21 if (!skb->dev)
22 goto drop;
9b22ea56
PM
23
24 return (polling ? netif_receive_skb(skb) : netif_rx(skb));
e1c096e2
HX
25
26drop:
27 dev_kfree_skb_any(skb);
28 return NET_RX_DROP;
9b22ea56
PM
29}
30EXPORT_SYMBOL(__vlan_hwaccel_rx);
31
32int vlan_hwaccel_do_receive(struct sk_buff *skb)
33{
e1c096e2 34 struct net_device *dev = skb->dev;
9793241f 35 struct vlan_rx_stats *rx_stats;
9b22ea56 36
e1c096e2 37 skb->dev = vlan_dev_info(dev)->real_dev;
bc1d0411
PM
38 netif_nit_deliver(skb);
39
9b22ea56
PM
40 skb->dev = dev;
41 skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
bc1d0411 42 skb->vlan_tci = 0;
7750f403 43
9793241f
ED
44 rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
45 smp_processor_id());
46
47 rx_stats->rx_packets++;
48 rx_stats->rx_bytes += skb->len;
7750f403 49
7750f403
PM
50 switch (skb->pkt_type) {
51 case PACKET_BROADCAST:
52 break;
53 case PACKET_MULTICAST:
9793241f 54 rx_stats->multicast++;
7750f403
PM
55 break;
56 case PACKET_OTHERHOST:
57 /* Our lower layer thinks this is not local, let's make sure.
58 * This allows the VLAN to have a different MAC than the
59 * underlying device, and still route correctly. */
60 if (!compare_ether_addr(eth_hdr(skb)->h_dest,
9b22ea56 61 dev->dev_addr))
7750f403
PM
62 skb->pkt_type = PACKET_HOST;
63 break;
ccbd6a5a 64 }
9b22ea56 65 return 0;
7750f403 66}
22d1ba74
PM
67
68struct net_device *vlan_dev_real_dev(const struct net_device *dev)
69{
70 return vlan_dev_info(dev)->real_dev;
71}
116cb428 72EXPORT_SYMBOL(vlan_dev_real_dev);
22d1ba74
PM
73
74u16 vlan_dev_vlan_id(const struct net_device *dev)
75{
76 return vlan_dev_info(dev)->vlan_id;
77}
116cb428 78EXPORT_SYMBOL(vlan_dev_vlan_id);
e1c096e2 79
5b252f0c
BH
80static gro_result_t
81vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
82 unsigned int vlan_tci, struct sk_buff *skb)
e1c096e2
HX
83{
84 struct sk_buff *p;
85
0641e4fb 86 if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
597a264b 87 skb->deliver_no_wcard = 1;
e1c096e2 88
1f3c8804 89 skb->skb_iif = skb->dev->ifindex;
b93ab837 90 __vlan_hwaccel_put_tag(skb, vlan_tci);
e1c096e2
HX
91 skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
92
93 if (!skb->dev)
94 goto drop;
95
96 for (p = napi->gro_list; p; p = p->next) {
aa4b9f53
HX
97 NAPI_GRO_CB(p)->same_flow =
98 p->dev == skb->dev && !compare_ether_header(
99 skb_mac_header(p), skb_gro_mac_header(skb));
e1c096e2
HX
100 NAPI_GRO_CB(p)->flush = 0;
101 }
102
103 return dev_gro_receive(napi, skb);
104
105drop:
d1c76af9 106 return GRO_DROP;
e1c096e2
HX
107}
108
c7c4b3b6
BH
109gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
110 unsigned int vlan_tci, struct sk_buff *skb)
e1c096e2 111{
2ffb4558 112 if (netpoll_rx_on(skb))
c7c4b3b6
BH
113 return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
114 ? GRO_DROP : GRO_NORMAL;
2ffb4558 115
86911732
HX
116 skb_gro_reset_offset(skb);
117
5d0d9be8 118 return napi_skb_finish(vlan_gro_common(napi, grp, vlan_tci, skb), skb);
e1c096e2
HX
119}
120EXPORT_SYMBOL(vlan_gro_receive);
121
c7c4b3b6
BH
122gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
123 unsigned int vlan_tci)
e1c096e2 124{
76620aaf 125 struct sk_buff *skb = napi_frags_skb(napi);
e1c096e2
HX
126
127 if (!skb)
c7c4b3b6 128 return GRO_DROP;
e1c096e2 129
1db9e29b
HX
130 if (netpoll_rx_on(skb)) {
131 skb->protocol = eth_type_trans(skb, skb->dev);
c7c4b3b6
BH
132 return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
133 ? GRO_DROP : GRO_NORMAL;
1db9e29b 134 }
2ffb4558 135
5d0d9be8
HX
136 return napi_frags_finish(napi, skb,
137 vlan_gro_common(napi, grp, vlan_tci, skb));
e1c096e2
HX
138}
139EXPORT_SYMBOL(vlan_gro_frags);