diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-12-07 23:11:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-08 19:51:30 -0500 |
commit | 7da82c06ded105bf601bfa0eafc92e84eb0ceeed (patch) | |
tree | 68d8787014addfab287626fcf36446437df9c7aa /net/8021q/vlan_netlink.c | |
parent | 6626873980475f303367f7b709f4703b571cf854 (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_netlink.c')
-rw-r--r-- | net/8021q/vlan_netlink.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 235c2197dbb6..50711368ad6a 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c | |||
@@ -105,7 +105,7 @@ static int vlan_changelink(struct net_device *dev, | |||
105 | static int vlan_newlink(struct net *src_net, struct net_device *dev, | 105 | static int vlan_newlink(struct net *src_net, struct net_device *dev, |
106 | struct nlattr *tb[], struct nlattr *data[]) | 106 | struct nlattr *tb[], struct nlattr *data[]) |
107 | { | 107 | { |
108 | struct vlan_dev_info *vlan = vlan_dev_info(dev); | 108 | struct vlan_dev_priv *vlan = vlan_dev_priv(dev); |
109 | struct net_device *real_dev; | 109 | struct net_device *real_dev; |
110 | int err; | 110 | int err; |
111 | 111 | ||
@@ -149,7 +149,7 @@ static inline size_t vlan_qos_map_size(unsigned int n) | |||
149 | 149 | ||
150 | static size_t vlan_get_size(const struct net_device *dev) | 150 | static size_t vlan_get_size(const struct net_device *dev) |
151 | { | 151 | { |
152 | struct vlan_dev_info *vlan = vlan_dev_info(dev); | 152 | struct vlan_dev_priv *vlan = vlan_dev_priv(dev); |
153 | 153 | ||
154 | return nla_total_size(2) + /* IFLA_VLAN_ID */ | 154 | return nla_total_size(2) + /* IFLA_VLAN_ID */ |
155 | sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */ | 155 | sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */ |
@@ -159,14 +159,14 @@ static size_t vlan_get_size(const struct net_device *dev) | |||
159 | 159 | ||
160 | static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) | 160 | static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) |
161 | { | 161 | { |
162 | struct vlan_dev_info *vlan = vlan_dev_info(dev); | 162 | struct vlan_dev_priv *vlan = vlan_dev_priv(dev); |
163 | struct vlan_priority_tci_mapping *pm; | 163 | struct vlan_priority_tci_mapping *pm; |
164 | struct ifla_vlan_flags f; | 164 | struct ifla_vlan_flags f; |
165 | struct ifla_vlan_qos_mapping m; | 165 | struct ifla_vlan_qos_mapping m; |
166 | struct nlattr *nest; | 166 | struct nlattr *nest; |
167 | unsigned int i; | 167 | unsigned int i; |
168 | 168 | ||
169 | NLA_PUT_U16(skb, IFLA_VLAN_ID, vlan_dev_info(dev)->vlan_id); | 169 | NLA_PUT_U16(skb, IFLA_VLAN_ID, vlan_dev_priv(dev)->vlan_id); |
170 | if (vlan->flags) { | 170 | if (vlan->flags) { |
171 | f.flags = vlan->flags; | 171 | f.flags = vlan->flags; |
172 | f.mask = ~0; | 172 | f.mask = ~0; |
@@ -218,7 +218,7 @@ struct rtnl_link_ops vlan_link_ops __read_mostly = { | |||
218 | .kind = "vlan", | 218 | .kind = "vlan", |
219 | .maxtype = IFLA_VLAN_MAX, | 219 | .maxtype = IFLA_VLAN_MAX, |
220 | .policy = vlan_policy, | 220 | .policy = vlan_policy, |
221 | .priv_size = sizeof(struct vlan_dev_info), | 221 | .priv_size = sizeof(struct vlan_dev_priv), |
222 | .setup = vlan_setup, | 222 | .setup = vlan_setup, |
223 | .validate = vlan_validate, | 223 | .validate = vlan_validate, |
224 | .newlink = vlan_newlink, | 224 | .newlink = vlan_newlink, |