diff options
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 9ee63583ed27..e32eeb37987e 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c | |||
@@ -75,7 +75,7 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[]) | |||
75 | static int vlan_changelink(struct net_device *dev, | 75 | static int vlan_changelink(struct net_device *dev, |
76 | struct nlattr *tb[], struct nlattr *data[]) | 76 | struct nlattr *tb[], struct nlattr *data[]) |
77 | { | 77 | { |
78 | struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev); | 78 | struct vlan_dev_info *vlan = vlan_dev_info(dev); |
79 | struct ifla_vlan_flags *flags; | 79 | struct ifla_vlan_flags *flags; |
80 | struct ifla_vlan_qos_mapping *m; | 80 | struct ifla_vlan_qos_mapping *m; |
81 | struct nlattr *attr; | 81 | struct nlattr *attr; |
@@ -104,7 +104,7 @@ static int vlan_changelink(struct net_device *dev, | |||
104 | static int vlan_newlink(struct net_device *dev, | 104 | static int vlan_newlink(struct net_device *dev, |
105 | struct nlattr *tb[], struct nlattr *data[]) | 105 | struct nlattr *tb[], struct nlattr *data[]) |
106 | { | 106 | { |
107 | struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev); | 107 | struct vlan_dev_info *vlan = vlan_dev_info(dev); |
108 | struct net_device *real_dev; | 108 | struct net_device *real_dev; |
109 | int err; | 109 | int err; |
110 | 110 | ||
@@ -148,7 +148,7 @@ static inline size_t vlan_qos_map_size(unsigned int n) | |||
148 | 148 | ||
149 | static size_t vlan_get_size(const struct net_device *dev) | 149 | static size_t vlan_get_size(const struct net_device *dev) |
150 | { | 150 | { |
151 | struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev); | 151 | struct vlan_dev_info *vlan = vlan_dev_info(dev); |
152 | 152 | ||
153 | return nla_total_size(2) + /* IFLA_VLAN_ID */ | 153 | return nla_total_size(2) + /* IFLA_VLAN_ID */ |
154 | vlan_qos_map_size(vlan->nr_ingress_mappings) + | 154 | vlan_qos_map_size(vlan->nr_ingress_mappings) + |
@@ -157,14 +157,14 @@ static size_t vlan_get_size(const struct net_device *dev) | |||
157 | 157 | ||
158 | static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) | 158 | static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) |
159 | { | 159 | { |
160 | struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev); | 160 | struct vlan_dev_info *vlan = vlan_dev_info(dev); |
161 | struct vlan_priority_tci_mapping *pm; | 161 | struct vlan_priority_tci_mapping *pm; |
162 | struct ifla_vlan_flags f; | 162 | struct ifla_vlan_flags f; |
163 | struct ifla_vlan_qos_mapping m; | 163 | struct ifla_vlan_qos_mapping m; |
164 | struct nlattr *nest; | 164 | struct nlattr *nest; |
165 | unsigned int i; | 165 | unsigned int i; |
166 | 166 | ||
167 | NLA_PUT_U16(skb, IFLA_VLAN_ID, VLAN_DEV_INFO(dev)->vlan_id); | 167 | NLA_PUT_U16(skb, IFLA_VLAN_ID, vlan_dev_info(dev)->vlan_id); |
168 | if (vlan->flags) { | 168 | if (vlan->flags) { |
169 | f.flags = vlan->flags; | 169 | f.flags = vlan->flags; |
170 | f.mask = ~0; | 170 | f.mask = ~0; |