aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.h
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-12-07 23:11:15 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-08 19:51:30 -0500
commit7da82c06ded105bf601bfa0eafc92e84eb0ceeed (patch)
tree68d8787014addfab287626fcf36446437df9c7aa /net/8021q/vlan.h
parent6626873980475f303367f7b709f4703b571cf854 (diff)
vlan: rename vlan_dev_info to vlan_dev_priv
As this structure is priv, name it approprietely. Also for pointer to it use name "vlan". Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.h')
-rw-r--r--net/8021q/vlan.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 9fd45f3571f..d3c4ea4a383 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -41,7 +41,7 @@ struct vlan_pcpu_stats {
41}; 41};
42 42
43/** 43/**
44 * struct vlan_dev_info - VLAN private device data 44 * struct vlan_dev_priv - VLAN private device data
45 * @nr_ingress_mappings: number of ingress priority mappings 45 * @nr_ingress_mappings: number of ingress priority mappings
46 * @ingress_priority_map: ingress priority mappings 46 * @ingress_priority_map: ingress priority mappings
47 * @nr_egress_mappings: number of egress priority mappings 47 * @nr_egress_mappings: number of egress priority mappings
@@ -53,7 +53,7 @@ struct vlan_pcpu_stats {
53 * @dent: proc dir entry 53 * @dent: proc dir entry
54 * @vlan_pcpu_stats: ptr to percpu rx stats 54 * @vlan_pcpu_stats: ptr to percpu rx stats
55 */ 55 */
56struct vlan_dev_info { 56struct vlan_dev_priv {
57 unsigned int nr_ingress_mappings; 57 unsigned int nr_ingress_mappings;
58 u32 ingress_priority_map[8]; 58 u32 ingress_priority_map[8];
59 unsigned int nr_egress_mappings; 59 unsigned int nr_egress_mappings;
@@ -69,7 +69,7 @@ struct vlan_dev_info {
69 struct vlan_pcpu_stats __percpu *vlan_pcpu_stats; 69 struct vlan_pcpu_stats __percpu *vlan_pcpu_stats;
70}; 70};
71 71
72static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev) 72static inline struct vlan_dev_priv *vlan_dev_priv(const struct net_device *dev)
73{ 73{
74 return netdev_priv(dev); 74 return netdev_priv(dev);
75} 75}
@@ -121,7 +121,7 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head);
121static inline u32 vlan_get_ingress_priority(struct net_device *dev, 121static inline u32 vlan_get_ingress_priority(struct net_device *dev,
122 u16 vlan_tci) 122 u16 vlan_tci)
123{ 123{
124 struct vlan_dev_info *vip = vlan_dev_info(dev); 124 struct vlan_dev_priv *vip = vlan_dev_priv(dev);
125 125
126 return vip->ingress_priority_map[(vlan_tci >> VLAN_PRIO_SHIFT) & 0x7]; 126 return vip->ingress_priority_map[(vlan_tci >> VLAN_PRIO_SHIFT) & 0x7];
127} 127}