aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-08 06:23:36 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 06:23:36 -0400
commit7750f403cbe56971336d575b354365190b4e3227 (patch)
treebc8a65b0dd0d5cc3faac943f7e3df0c6dfedeaf6 /net/8021q
parent75b8846acd11ad3fc736d4df3413fe946bbf367c (diff)
vlan: uninline __vlan_hwaccel_rx
The function is huge and included at least once in every VLAN acceleration capable driver. Uninline it; to avoid having drivers depend on the VLAN module, the function is always built in statically when VLAN is enabled. With all VLAN acceleration capable drivers that build on x86_64 enabled, this results in: text data bss dec hex filename 6515227 854044 343968 7713239 75b1d7 vmlinux.inlined 6505637 854044 343968 7703649 758c61 vmlinux.uninlined ---------------------------------------------------------- -9590 Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/Makefile9
-rw-r--r--net/8021q/vlan.h8
-rw-r--r--net/8021q/vlan_core.c48
3 files changed, 61 insertions, 4 deletions
diff --git a/net/8021q/Makefile b/net/8021q/Makefile
index 3006e9ed7b08..9f4f174ead1c 100644
--- a/net/8021q/Makefile
+++ b/net/8021q/Makefile
@@ -1,9 +1,10 @@
1# 1#
2# Makefile for the Linux VLAN layer. 2# Makefile for the Linux VLAN layer.
3# 3#
4obj-$(subst m,y,$(CONFIG_VLAN_8021Q)) += vlan_core.o
5obj-$(CONFIG_VLAN_8021Q) += 8021q.o
4 6
5obj-$(CONFIG_VLAN_8021Q) += 8021q.o 78021q-y := vlan.o vlan_dev.o vlan_netlink.o
88021q-$(CONFIG_VLAN_8021Q_GVRP) += vlan_gvrp.o
98021q-$(CONFIG_PROC_FS) += vlanproc.o
6 10
78021q-y := vlan.o vlan_dev.o vlan_netlink.o
88021q-$(CONFIG_VLAN_8021Q_GVRP) += vlan_gvrp.o
98021q-$(CONFIG_PROC_FS) += vlanproc.o
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 097b2e04c928..7cc1a97c42fc 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -37,6 +37,14 @@ void vlan_setup(struct net_device *dev);
37int register_vlan_dev(struct net_device *dev); 37int register_vlan_dev(struct net_device *dev);
38void unregister_vlan_dev(struct net_device *dev); 38void unregister_vlan_dev(struct net_device *dev);
39 39
40static inline u32 vlan_get_ingress_priority(struct net_device *dev,
41 unsigned short vlan_tag)
42{
43 struct vlan_dev_info *vip = vlan_dev_info(dev);
44
45 return vip->ingress_priority_map[(vlan_tag >> 13) & 0x7];
46}
47
40#ifdef CONFIG_VLAN_8021Q_GVRP 48#ifdef CONFIG_VLAN_8021Q_GVRP
41extern int vlan_gvrp_request_join(const struct net_device *dev); 49extern int vlan_gvrp_request_join(const struct net_device *dev);
42extern void vlan_gvrp_request_leave(const struct net_device *dev); 50extern void vlan_gvrp_request_leave(const struct net_device *dev);
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
new file mode 100644
index 000000000000..85c94edb000f
--- /dev/null
+++ b/net/8021q/vlan_core.c
@@ -0,0 +1,48 @@
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}(). */
7int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
8 unsigned short vlan_tag, 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_tag & 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_tag);
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}
48EXPORT_SYMBOL(__vlan_hwaccel_rx);