[VLAN]: Turn VLAN_DEV_INFO into inline function

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

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[])
 static int vlan_changelink(struct net_device *dev,
                            struct nlattr *tb[], struct nlattr *data[])
 {
-        struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
+        struct vlan_dev_info *vlan = vlan_dev_info(dev);
         struct ifla_vlan_flags *flags;
         struct ifla_vlan_qos_mapping *m;
         struct nlattr *attr;
@@ -104,7 +104,7 @@ static int vlan_changelink(struct net_device *dev,
 static int vlan_newlink(struct net_device *dev,
                         struct nlattr *tb[], struct nlattr *data[])
 {
-        struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
+        struct vlan_dev_info *vlan = vlan_dev_info(dev);
         struct net_device *real_dev;
         int err;
 
@@ -148,7 +148,7 @@ static inline size_t vlan_qos_map_size(unsigned int n)
 
 static size_t vlan_get_size(const struct net_device *dev)
 {
-        struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
+        struct vlan_dev_info *vlan = vlan_dev_info(dev);
 
         return nla_total_size(2) +      /* IFLA_VLAN_ID */
                vlan_qos_map_size(vlan->nr_ingress_mappings) +
@@ -157,14 +157,14 @@ static size_t vlan_get_size(const struct net_device *dev)
 
 static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
-        struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
+        struct vlan_dev_info *vlan = vlan_dev_info(dev);
         struct vlan_priority_tci_mapping *pm;
         struct ifla_vlan_flags f;
         struct ifla_vlan_qos_mapping m;
         struct nlattr *nest;
         unsigned int i;
 
-        NLA_PUT_U16(skb, IFLA_VLAN_ID, VLAN_DEV_INFO(dev)->vlan_id);
+        NLA_PUT_U16(skb, IFLA_VLAN_ID, vlan_dev_info(dev)->vlan_id);
         if (vlan->flags) {
                 f.flags = vlan->flags;
                 f.mask  = ~0;