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