net: dsa: Use conduit and user terms

[linux-2.6-microblaze.git] / net / dsa / netlink.c

diff --git a/net/dsa/netlink.c b/net/dsa/netlink.c
index bd4bbaf..f56f90a 100644 (file)
--- a/net/dsa/netlink.c
+++ b/net/dsa/netlink.c
@@ -5,7 +5,7 @@
 #include <net/rtnetlink.h>
 
 #include "netlink.h"
-#include "slave.h"
+#include "user.h"
 
 static const struct nla_policy dsa_policy[IFLA_DSA_MAX + 1] = {
        [IFLA_DSA_MASTER]       = { .type = NLA_U32 },
@@ -22,13 +22,13 @@ static int dsa_changelink(struct net_device *dev, struct nlattr *tb[],
 
        if (data[IFLA_DSA_MASTER]) {
                u32 ifindex = nla_get_u32(data[IFLA_DSA_MASTER]);
-               struct net_device *master;
+               struct net_device *conduit;
 
-               master = __dev_get_by_index(dev_net(dev), ifindex);
-               if (!master)
+               conduit = __dev_get_by_index(dev_net(dev), ifindex);
+               if (!conduit)
                        return -EINVAL;
 
-               err = dsa_slave_change_master(dev, master, extack);
+               err = dsa_user_change_conduit(dev, conduit, extack);
                if (err)
                        return err;
        }
@@ -44,9 +44,9 @@ static size_t dsa_get_size(const struct net_device *dev)
 
 static int dsa_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
-       struct net_device *master = dsa_slave_to_master(dev);
+       struct net_device *conduit = dsa_user_to_conduit(dev);
 
-       if (nla_put_u32(skb, IFLA_DSA_MASTER, master->ifindex))
+       if (nla_put_u32(skb, IFLA_DSA_MASTER, conduit->ifindex))
                return -EMSGSIZE;
 
        return 0;