vlan: Implement vlan_dev_get_egress_qos_mask as an inline.

This is to avoid very silly Kconfig dependencies for modules using this routine. Signed-off-by: David S. Miller <davem@davemloft.net>
author: David S. Miller <davem@davemloft.net> 2013-11-11 00:42:07 -0500
committer: David S. Miller <davem@davemloft.net> 2013-11-11 00:42:07 -0500
commit: e267cb960ab790c94a5019272c0e4dac95dc4dba (patch)
tree: 483785140f9ad26db0241f2aa22e9cd00b6f6828
parent: 170e85430bcbe4d18e81b5a70bb163c741381092 (diff)
3 files changed, 99 insertions, 107 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f3088a0112cf..f252deb99454 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -88,8 +88,102 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
                                               __be16 vlan_proto, u16 vlan_id);
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
 extern u16 vlan_dev_vlan_id(const struct net_device *dev);
-extern u16 vlan_dev_get_egress_qos_mask(struct net_device *dev,
-                                        u32 skprio);
+/**
+ *      struct vlan_priority_tci_mapping - vlan egress priority mappings
+ *      @priority: skb priority
+ *      @vlan_qos: vlan priority: (skb->priority << 13) & 0xE000
+ *      @next: pointer to next struct
+ */
+struct vlan_priority_tci_mapping {
+        u32                                     priority;
+        u16                                     vlan_qos;
+        struct vlan_priority_tci_mapping        *next;
+};
+/**
+ *      struct vlan_pcpu_stats - VLAN percpu rx/tx stats
+ *      @rx_packets: number of received packets
+ *      @rx_bytes: number of received bytes
+ *      @rx_multicast: number of received multicast packets
+ *      @tx_packets: number of transmitted packets
+ *      @tx_bytes: number of transmitted bytes
+ *      @syncp: synchronization point for 64bit counters
+ *      @rx_errors: number of rx errors
+ *      @tx_dropped: number of tx drops
+ */
+struct vlan_pcpu_stats {
+        u64                     rx_packets;
+        u64                     rx_bytes;
+        u64                     rx_multicast;
+        u64                     tx_packets;
+        u64                     tx_bytes;
+        struct u64_stats_sync   syncp;
+        u32                     rx_errors;
+        u32                     tx_dropped;
+};
+struct proc_dir_entry;
+struct netpoll;
+/**
+ *      struct vlan_dev_priv - VLAN private device data
+ *      @nr_ingress_mappings: number of ingress priority mappings
+ *      @ingress_priority_map: ingress priority mappings
+ *      @nr_egress_mappings: number of egress priority mappings
+ *      @egress_priority_map: hash of egress priority mappings
+ *      @vlan_proto: VLAN encapsulation protocol
+ *      @vlan_id: VLAN identifier
+ *      @flags: device flags
+ *      @real_dev: underlying netdevice
+ *      @real_dev_addr: address of underlying netdevice
+ *      @dent: proc dir entry
+ *      @vlan_pcpu_stats: ptr to percpu rx stats
+ */
+struct vlan_dev_priv {
+        unsigned int                            nr_ingress_mappings;
+        u32                                     ingress_priority_map[8];
+        unsigned int                            nr_egress_mappings;
+        struct vlan_priority_tci_mapping        *egress_priority_map[16];
+        __be16                                  vlan_proto;
+        u16                                     vlan_id;
+        u16                                     flags;
+        struct net_device                       *real_dev;
+        unsigned char                           real_dev_addr[ETH_ALEN];
+        struct proc_dir_entry                   *dent;
+        struct vlan_pcpu_stats __percpu         *vlan_pcpu_stats;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        struct netpoll                          *netpoll;
+#endif
+};
+static inline struct vlan_dev_priv *vlan_dev_priv(const struct net_device *dev)
+{
+        return netdev_priv(dev);
+}
+static inline u16
+vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
+{
+        struct vlan_priority_tci_mapping *mp;
+        smp_rmb(); /* coupled with smp_wmb() in vlan_dev_set_egress_priority() */
+        mp = vlan_dev_priv(dev)->egress_priority_map[(skprio & 0xF)];
+        while (mp) {
+                if (mp->priority == skprio) {
+                        return mp->vlan_qos; /* This should already be shifted
+                                              * to mask correctly with the
+                                              * VLAN's TCI */
+                }
+                mp = mp->next;
+        }
+        return 0;
+}
 extern bool vlan_do_receive(struct sk_buff **skb);
 extern struct sk_buff *vlan_untag(struct sk_buff *skb);
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index a2caf00b82cc..5704ed9c3a23 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -5,83 +5,6 @@
 #include <linux/u64_stats_sync.h>
 #include <linux/list.h>
-/**
- *      struct vlan_priority_tci_mapping - vlan egress priority mappings
- *      @priority: skb priority
- *      @vlan_qos: vlan priority: (skb->priority << 13) & 0xE000
- *      @next: pointer to next struct
- */
-struct vlan_priority_tci_mapping {
-        u32                                     priority;
-        u16                                     vlan_qos;
-        struct vlan_priority_tci_mapping        *next;
-};
-/**
- *      struct vlan_pcpu_stats - VLAN percpu rx/tx stats
- *      @rx_packets: number of received packets
- *      @rx_bytes: number of received bytes
- *      @rx_multicast: number of received multicast packets
- *      @tx_packets: number of transmitted packets
- *      @tx_bytes: number of transmitted bytes
- *      @syncp: synchronization point for 64bit counters
- *      @rx_errors: number of rx errors
- *      @tx_dropped: number of tx drops
- */
-struct vlan_pcpu_stats {
-        u64                     rx_packets;
-        u64                     rx_bytes;
-        u64                     rx_multicast;
-        u64                     tx_packets;
-        u64                     tx_bytes;
-        struct u64_stats_sync   syncp;
-        u32                     rx_errors;
-        u32                     tx_dropped;
-};
-struct netpoll;
-/**
- *      struct vlan_dev_priv - VLAN private device data
- *      @nr_ingress_mappings: number of ingress priority mappings
- *      @ingress_priority_map: ingress priority mappings
- *      @nr_egress_mappings: number of egress priority mappings
- *      @egress_priority_map: hash of egress priority mappings
- *      @vlan_proto: VLAN encapsulation protocol
- *      @vlan_id: VLAN identifier
- *      @flags: device flags
- *      @real_dev: underlying netdevice
- *      @real_dev_addr: address of underlying netdevice
- *      @dent: proc dir entry
- *      @vlan_pcpu_stats: ptr to percpu rx stats
- */
-struct vlan_dev_priv {
-        unsigned int                            nr_ingress_mappings;
-        u32                                     ingress_priority_map[8];
-        unsigned int                            nr_egress_mappings;
-        struct vlan_priority_tci_mapping        *egress_priority_map[16];
-        __be16                                  vlan_proto;
-        u16                                     vlan_id;
-        u16                                     flags;
-        struct net_device                       *real_dev;
-        unsigned char                           real_dev_addr[ETH_ALEN];
-        struct proc_dir_entry                   *dent;
-        struct vlan_pcpu_stats __percpu         *vlan_pcpu_stats;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        struct netpoll                          *netpoll;
-#endif
-};
-static inline struct vlan_dev_priv *vlan_dev_priv(const struct net_device *dev)
-{
-        return netdev_priv(dev);
-}
 /* if this changes, algorithm will have to be reworked because this
 * depends on completely exhausting the VLAN identifier space.  Thus
 * it gives constant time look-up, but in many cases it wastes memory.
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 13904a414929..8db1b985dbf1 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -68,31 +68,6 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb)
        return 0;
 }
-static inline u16
-__vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
-{
-        struct vlan_priority_tci_mapping *mp;
-        smp_rmb(); /* coupled with smp_wmb() in vlan_dev_set_egress_priority() */
-        mp = vlan_dev_priv(dev)->egress_priority_map[(skprio & 0xF)];
-        while (mp) {
-                if (mp->priority == skprio) {
-                        return mp->vlan_qos; /* This should already be shifted
-                                              * to mask correctly with the
-                                              * VLAN's TCI */
-                }
-                mp = mp->next;
-        }
-        return 0;
-}
-u16 vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
-{
-        return __vlan_dev_get_egress_qos_mask(dev, skprio);
-}
-EXPORT_SYMBOL(vlan_dev_get_egress_qos_mask);
 /*
 *      Create the VLAN header for an arbitrary protocol layer
 *
@@ -117,7 +92,7 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
                vlan_tci = vlan->vlan_id;
-                vlan_tci |= __vlan_dev_get_egress_qos_mask(dev, skb->priority);
+                vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);
                vhdr->h_vlan_TCI = htons(vlan_tci);
                /*
@@ -174,7 +149,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
            vlan->flags & VLAN_FLAG_REORDER_HDR) {
                u16 vlan_tci;
                vlan_tci = vlan->vlan_id;
-                vlan_tci |= __vlan_dev_get_egress_qos_mask(dev, skb->priority);
+                vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);
                skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);
        }
@@ -259,7 +234,7 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
        np->vlan_qos = vlan_qos;
        /* Before inserting this element in hash table, make sure all its fields
         * are committed to memory.
-         * coupled with smp_rmb() in __vlan_dev_get_egress_qos_mask()
+         * coupled with smp_rmb() in vlan_dev_get_egress_qos_mask()
         */
        smp_wmb();
        vlan->egress_priority_map[skb_prio & 0xF] = np;
author	David S. Miller <davem@davemloft.net>	2013-11-11 00:42:07 -0500
committer	David S. Miller <davem@davemloft.net>	2013-11-11 00:42:07 -0500
commit	e267cb960ab790c94a5019272c0e4dac95dc4dba (patch)
tree	483785140f9ad26db0241f2aa22e9cd00b6f6828
parent	170e85430bcbe4d18e81b5a70bb163c741381092 (diff)

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index f3088a0112cf..f252deb99454 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h
@@ -88,8 +88,102 @@ extern struct net_device __vlan_find_dev_deep(struct net_device real_dev,
88	__be16 vlan_proto, u16 vlan_id);	88	__be16 vlan_proto, u16 vlan_id);
89	extern struct net_device vlan_dev_real_dev(const struct net_device dev);	89	extern struct net_device vlan_dev_real_dev(const struct net_device dev);
90	extern u16 vlan_dev_vlan_id(const struct net_device *dev);	90	extern u16 vlan_dev_vlan_id(const struct net_device *dev);
91	extern u16 vlan_dev_get_egress_qos_mask(struct net_device *dev,	91
92	u32 skprio);	92	/**
		93	* struct vlan_priority_tci_mapping - vlan egress priority mappings
		94	* @priority: skb priority
		95	* @vlan_qos: vlan priority: (skb->priority << 13) & 0xE000
		96	* @next: pointer to next struct
		97	*/
		98	struct vlan_priority_tci_mapping {
		99	u32 priority;
		100	u16 vlan_qos;
		101	struct vlan_priority_tci_mapping *next;
		102	};
		103
		104	/**
		105	* struct vlan_pcpu_stats - VLAN percpu rx/tx stats
		106	* @rx_packets: number of received packets
		107	* @rx_bytes: number of received bytes
		108	* @rx_multicast: number of received multicast packets
		109	* @tx_packets: number of transmitted packets
		110	* @tx_bytes: number of transmitted bytes
		111	* @syncp: synchronization point for 64bit counters
		112	* @rx_errors: number of rx errors
		113	* @tx_dropped: number of tx drops
		114	*/
		115	struct vlan_pcpu_stats {
		116	u64 rx_packets;
		117	u64 rx_bytes;
		118	u64 rx_multicast;
		119	u64 tx_packets;
		120	u64 tx_bytes;
		121	struct u64_stats_sync syncp;
		122	u32 rx_errors;
		123	u32 tx_dropped;
		124	};
		125
		126	struct proc_dir_entry;
		127	struct netpoll;
		128
		129	/**
		130	* struct vlan_dev_priv - VLAN private device data
		131	* @nr_ingress_mappings: number of ingress priority mappings
		132	* @ingress_priority_map: ingress priority mappings
		133	* @nr_egress_mappings: number of egress priority mappings
		134	* @egress_priority_map: hash of egress priority mappings
		135	* @vlan_proto: VLAN encapsulation protocol
		136	* @vlan_id: VLAN identifier
		137	* @flags: device flags
		138	* @real_dev: underlying netdevice
		139	* @real_dev_addr: address of underlying netdevice
		140	* @dent: proc dir entry
		141	* @vlan_pcpu_stats: ptr to percpu rx stats
		142	*/
		143	struct vlan_dev_priv {
		144	unsigned int nr_ingress_mappings;
		145	u32 ingress_priority_map[8];
		146	unsigned int nr_egress_mappings;
		147	struct vlan_priority_tci_mapping *egress_priority_map[16];
		148
		149	__be16 vlan_proto;
		150	u16 vlan_id;
		151	u16 flags;
		152
		153	struct net_device *real_dev;
		154	unsigned char real_dev_addr[ETH_ALEN];
		155
		156	struct proc_dir_entry *dent;
		157	struct vlan_pcpu_stats __percpu *vlan_pcpu_stats;
		158	#ifdef CONFIG_NET_POLL_CONTROLLER
		159	struct netpoll *netpoll;
		160	#endif
		161	};
		162
		163	static inline struct vlan_dev_priv vlan_dev_priv(const struct net_device dev)
		164	{
		165	return netdev_priv(dev);
		166	}
		167
		168	static inline u16
		169	vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
		170	{
		171	struct vlan_priority_tci_mapping *mp;
		172
		173	smp_rmb(); /* coupled with smp_wmb() in vlan_dev_set_egress_priority() */
		174
		175	mp = vlan_dev_priv(dev)->egress_priority_map[(skprio & 0xF)];
		176	while (mp) {
		177	if (mp->priority == skprio) {
		178	return mp->vlan_qos; /* This should already be shifted
		179	* to mask correctly with the
		180	* VLAN's TCI */
		181	}
		182	mp = mp->next;
		183	}
		184	return 0;
		185	}
		186
93	extern bool vlan_do_receive(struct sk_buff **skb);	187	extern bool vlan_do_receive(struct sk_buff **skb);
94	extern struct sk_buff vlan_untag(struct sk_buff skb);	188	extern struct sk_buff vlan_untag(struct sk_buff skb);
95		189


diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index a2caf00b82cc..5704ed9c3a23 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h
@@ -5,83 +5,6 @@
5	#include <linux/u64_stats_sync.h>	5	#include <linux/u64_stats_sync.h>
6	#include <linux/list.h>	6	#include <linux/list.h>
7		7
8
9	/**
10	* struct vlan_priority_tci_mapping - vlan egress priority mappings
11	* @priority: skb priority
12	* @vlan_qos: vlan priority: (skb->priority << 13) & 0xE000
13	* @next: pointer to next struct
14	*/
15	struct vlan_priority_tci_mapping {
16	u32 priority;
17	u16 vlan_qos;
18	struct vlan_priority_tci_mapping *next;
19	};
20
21
22	/**
23	* struct vlan_pcpu_stats - VLAN percpu rx/tx stats
24	* @rx_packets: number of received packets
25	* @rx_bytes: number of received bytes
26	* @rx_multicast: number of received multicast packets
27	* @tx_packets: number of transmitted packets
28	* @tx_bytes: number of transmitted bytes
29	* @syncp: synchronization point for 64bit counters
30	* @rx_errors: number of rx errors
31	* @tx_dropped: number of tx drops
32	*/
33	struct vlan_pcpu_stats {
34	u64 rx_packets;
35	u64 rx_bytes;
36	u64 rx_multicast;
37	u64 tx_packets;
38	u64 tx_bytes;
39	struct u64_stats_sync syncp;
40	u32 rx_errors;
41	u32 tx_dropped;
42	};
43
44	struct netpoll;
45
46	/**
47	* struct vlan_dev_priv - VLAN private device data
48	* @nr_ingress_mappings: number of ingress priority mappings
49	* @ingress_priority_map: ingress priority mappings
50	* @nr_egress_mappings: number of egress priority mappings
51	* @egress_priority_map: hash of egress priority mappings
52	* @vlan_proto: VLAN encapsulation protocol
53	* @vlan_id: VLAN identifier
54	* @flags: device flags
55	* @real_dev: underlying netdevice
56	* @real_dev_addr: address of underlying netdevice
57	* @dent: proc dir entry
58	* @vlan_pcpu_stats: ptr to percpu rx stats
59	*/
60	struct vlan_dev_priv {
61	unsigned int nr_ingress_mappings;
62	u32 ingress_priority_map[8];
63	unsigned int nr_egress_mappings;
64	struct vlan_priority_tci_mapping *egress_priority_map[16];
65
66	__be16 vlan_proto;
67	u16 vlan_id;
68	u16 flags;
69
70	struct net_device *real_dev;
71	unsigned char real_dev_addr[ETH_ALEN];
72
73	struct proc_dir_entry *dent;
74	struct vlan_pcpu_stats __percpu *vlan_pcpu_stats;
75	#ifdef CONFIG_NET_POLL_CONTROLLER
76	struct netpoll *netpoll;
77	#endif
78	};
79
80	static inline struct vlan_dev_priv vlan_dev_priv(const struct net_device dev)
81	{
82	return netdev_priv(dev);
83	}
84
85	/* if this changes, algorithm will have to be reworked because this	8	/* if this changes, algorithm will have to be reworked because this
86	* depends on completely exhausting the VLAN identifier space. Thus	9	* depends on completely exhausting the VLAN identifier space. Thus
87	* it gives constant time look-up, but in many cases it wastes memory.	10	* it gives constant time look-up, but in many cases it wastes memory.


diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 13904a414929..8db1b985dbf1 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c
@@ -68,31 +68,6 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb)
68	return 0;	68	return 0;
69	}	69	}
70		70
71	static inline u16
72	__vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
73	{
74	struct vlan_priority_tci_mapping *mp;
75
76	smp_rmb(); /* coupled with smp_wmb() in vlan_dev_set_egress_priority() */
77
78	mp = vlan_dev_priv(dev)->egress_priority_map[(skprio & 0xF)];
79	while (mp) {
80	if (mp->priority == skprio) {
81	return mp->vlan_qos; /* This should already be shifted
82	* to mask correctly with the
83	* VLAN's TCI */
84	}
85	mp = mp->next;
86	}
87	return 0;
88	}
89
90	u16 vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio)
91	{
92	return __vlan_dev_get_egress_qos_mask(dev, skprio);
93	}
94	EXPORT_SYMBOL(vlan_dev_get_egress_qos_mask);
95
96	/*	71	/*
97	* Create the VLAN header for an arbitrary protocol layer	72	* Create the VLAN header for an arbitrary protocol layer
98	*	73	*
@@ -117,7 +92,7 @@ static int vlan_dev_hard_header(struct sk_buff skb, struct net_device dev,
117	vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);	92	vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
118		93
119	vlan_tci = vlan->vlan_id;	94	vlan_tci = vlan->vlan_id;
120	vlan_tci \|= __vlan_dev_get_egress_qos_mask(dev, skb->priority);	95	vlan_tci \|= vlan_dev_get_egress_qos_mask(dev, skb->priority);
121	vhdr->h_vlan_TCI = htons(vlan_tci);	96	vhdr->h_vlan_TCI = htons(vlan_tci);
122		97
123	/*	98	/*
@@ -174,7 +149,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
174	vlan->flags & VLAN_FLAG_REORDER_HDR) {	149	vlan->flags & VLAN_FLAG_REORDER_HDR) {
175	u16 vlan_tci;	150	u16 vlan_tci;
176	vlan_tci = vlan->vlan_id;	151	vlan_tci = vlan->vlan_id;
177	vlan_tci \|= __vlan_dev_get_egress_qos_mask(dev, skb->priority);	152	vlan_tci \|= vlan_dev_get_egress_qos_mask(dev, skb->priority);
178	skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);	153	skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);
179	}	154	}
180		155
@@ -259,7 +234,7 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
259	np->vlan_qos = vlan_qos;	234	np->vlan_qos = vlan_qos;
260	/* Before inserting this element in hash table, make sure all its fields	235	/* Before inserting this element in hash table, make sure all its fields
261	* are committed to memory.	236	* are committed to memory.
262	* coupled with smp_rmb() in __vlan_dev_get_egress_qos_mask()	237	* coupled with smp_rmb() in vlan_dev_get_egress_qos_mask()
263	*/	238	*/
264	smp_wmb();	239	smp_wmb();
265	vlan->egress_priority_map[skb_prio & 0xF] = np;	240	vlan->egress_priority_map[skb_prio & 0xF] = np;