5 files changed, 36 insertions, 39 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 517215391514..6aacc2314a8f 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -118,10 +118,7 @@ int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp)
         struct net_device *master;
         struct ethtool_ops *cpu_ops;
 
-        master = ds->dst->master_netdev;
-        if (ds->master_netdev)
-                master = ds->master_netdev;
-
+        master = ds->dst->cpu_dp->netdev;
         cpu_ops = devm_kzalloc(ds->dev, sizeof(*cpu_ops), GFP_KERNEL);
         if (!cpu_ops)
                 return -ENOMEM;
@@ -142,9 +139,7 @@ void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp)
         struct dsa_switch *ds = cpu_dp->ds;
         struct net_device *master;
 
-        master = ds->dst->master_netdev;
-        if (ds->master_netdev)
-                master = ds->master_netdev;
+        master = ds->dst->cpu_dp->netdev;
 
         master->ethtool_ops = ds->dst->master_orig_ethtool_ops;
 }
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index f88e1dddb74a..ab48c4f989da 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -337,7 +337,7 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
                 return err;
 
         if (ds->ops->set_addr) {
-                err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
+                err = ds->ops->set_addr(ds, dst->cpu_dp->netdev->dev_addr);
                 if (err < 0)
                         return err;
         }
@@ -444,7 +444,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
          * sent to the tag format's receive function.
          */
         wmb();
-        dst->master_netdev->dsa_ptr = dst;
+        dst->cpu_dp->netdev->dsa_ptr = dst;
         dst->applied = true;
 
         return 0;
@@ -458,7 +458,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
         if (!dst->applied)
                 return;
 
-        dst->master_netdev->dsa_ptr = NULL;
+        dst->cpu_dp->netdev->dsa_ptr = NULL;
 
         /* If we used a tagging format that doesn't have an ethertype
          * field, make sure that all packets from this point get sent
@@ -504,14 +504,10 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index,
         if (!ethernet_dev)
                 return -EPROBE_DEFER;
 
-        if (!ds->master_netdev)
-                ds->master_netdev = ethernet_dev;
-
-        if (!dst->master_netdev)
-                dst->master_netdev = ethernet_dev;
-
-        if (!dst->cpu_dp)
+        if (!dst->cpu_dp) {
                 dst->cpu_dp = port;
+                dst->cpu_dp->netdev = ethernet_dev;
+        }
 
         tag_protocol = ds->ops->get_tag_protocol(ds);
         dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
@@ -578,7 +574,7 @@ static int dsa_dst_parse(struct dsa_switch_tree *dst)
                         return err;
         }
 
-        if (!dst->master_netdev) {
+        if (!dst->cpu_dp->netdev) {
                 pr_warn("Tree has no master device\n");
                 return -EINVAL;
         }
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 66ee248796c8..5c510f4ba0ce 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -183,4 +183,9 @@ extern const struct dsa_device_ops qca_netdev_ops;
 /* tag_trailer.c */
 extern const struct dsa_device_ops trailer_netdev_ops;
 
+static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p)
+{
+        return p->dp->ds->dst->cpu_dp->netdev;
+}
+
 #endif
diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index 3a56de8f51a8..5d4f6ffa3424 100644
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -101,9 +101,12 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
         struct dsa_switch_tree *dst = ds->dst;
         struct dsa_chip_data *cd = ds->cd;
         bool valid_name_found = false;
+        struct net_device *master;
         int index = ds->index;
         int i, ret;
 
+        master = dst->cpu_dp->netdev;
+
         /*
          * Validate supplied switch configuration.
          */
@@ -116,7 +119,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 
                 if (!strcmp(name, "cpu")) {
                         if (dst->cpu_dp) {
-                                netdev_err(dst->master_netdev,
+                                netdev_err(master,
                                            "multiple cpu ports?!\n");
                                 return -EINVAL;
                         }
@@ -168,7 +171,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                 return ret;
 
         if (ops->set_addr) {
-                ret = ops->set_addr(ds, dst->master_netdev->dev_addr);
+                ret = ops->set_addr(ds, master->dev_addr);
                 if (ret < 0)
                         return ret;
         }
@@ -195,14 +198,14 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 
                 ret = dsa_slave_create(ds, parent, i, cd->port_names[i]);
                 if (ret < 0)
-                        netdev_err(dst->master_netdev, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
+                        netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n",
                                    index, i, cd->port_names[i], ret);
         }
 
         /* Perform configuration of the CPU and DSA ports */
         ret = dsa_cpu_dsa_setups(ds, parent);
         if (ret < 0)
-                netdev_err(dst->master_netdev, "[%d] : can't configure CPU and DSA ports\n",
+                netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",
                            index);
 
         ret = dsa_cpu_port_ethtool_setup(ds->dst->cpu_dp);
@@ -217,6 +220,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
                  struct device *parent, struct device *host_dev)
 {
         struct dsa_chip_data *cd = dst->pd->chip + index;
+        struct net_device *master = dst->cpu_dp->netdev;
         const struct dsa_switch_ops *ops;
         struct dsa_switch *ds;
         int ret;
@@ -228,11 +232,11 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
          */
         ops = dsa_switch_probe(parent, host_dev, cd->sw_addr, &name, &priv);
         if (!ops) {
-                netdev_err(dst->master_netdev, "[%d]: could not detect attached switch\n",
+                netdev_err(master, "[%d]: could not detect attached switch\n",
                            index);
                 return ERR_PTR(-EINVAL);
         }
-        netdev_info(dst->master_netdev, "[%d]: detected a %s switch\n",
+        netdev_info(master, "[%d]: detected a %s switch\n",
                     index, name);
 
 
@@ -575,7 +579,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
         unsigned configured = 0;
 
         dst->pd = pd;
-        dst->master_netdev = dev;
+        dst->cpu_dp->netdev = dev;
 
         for (i = 0; i < pd->nr_chips; i++) {
                 struct dsa_switch *ds;
@@ -671,7 +675,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
 {
         int i;
 
-        dst->master_netdev->dsa_ptr = NULL;
+        dst->cpu_dp->netdev->dsa_ptr = NULL;
 
         /* If we used a tagging format that doesn't have an ethertype
          * field, make sure that all packets from this point get sent
@@ -688,7 +692,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
 
         dsa_cpu_port_ethtool_restore(dst->cpu_dp);
 
-        dev_put(dst->master_netdev);
+        dev_put(dst->cpu_dp->netdev);
 }
 
 static int dsa_remove(struct platform_device *pdev)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 5e45ae5c3f71..658bc67c5320 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -66,7 +66,7 @@ static int dsa_slave_get_iflink(const struct net_device *dev)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
 
-        return p->dp->ds->dst->master_netdev->ifindex;
+        return dsa_master_netdev(p)->ifindex;
 }
 
 static int dsa_slave_open(struct net_device *dev)
@@ -74,7 +74,7 @@ static int dsa_slave_open(struct net_device *dev)
         struct dsa_slave_priv *p = netdev_priv(dev);
         struct dsa_port *dp = p->dp;
         struct dsa_switch *ds = dp->ds;
-        struct net_device *master = ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
         u8 stp_state = dp->bridge_dev ? BR_STATE_BLOCKING : BR_STATE_FORWARDING;
         int err;
 
@@ -127,7 +127,7 @@ out:
 static int dsa_slave_close(struct net_device *dev)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
-        struct net_device *master = p->dp->ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
         struct dsa_switch *ds = p->dp->ds;
 
         if (p->phy)
@@ -154,7 +154,7 @@ static int dsa_slave_close(struct net_device *dev)
 static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
-        struct net_device *master = p->dp->ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
 
         if (change & IFF_ALLMULTI)
                 dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1);
@@ -165,7 +165,7 @@ static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
 static void dsa_slave_set_rx_mode(struct net_device *dev)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
-        struct net_device *master = p->dp->ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
 
         dev_mc_sync(master, dev);
         dev_uc_sync(master, dev);
@@ -174,7 +174,7 @@ static void dsa_slave_set_rx_mode(struct net_device *dev)
 static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
-        struct net_device *master = p->dp->ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
         struct sockaddr *addr = a;
         int err;
 
@@ -375,7 +375,7 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Queue the SKB for transmission on the parent interface, but
          * do not modify its EtherType
          */
-        nskb->dev = p->dp->ds->dst->master_netdev;
+        nskb->dev = dsa_master_netdev(p);
         dev_queue_xmit(nskb);
 
         return NETDEV_TX_OK;
@@ -684,8 +684,7 @@ static int dsa_slave_netpoll_setup(struct net_device *dev,
                                    struct netpoll_info *ni)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
-        struct dsa_switch *ds = p->dp->ds;
-        struct net_device *master = ds->dst->master_netdev;
+        struct net_device *master = dsa_master_netdev(p);
         struct netpoll *netpoll;
         int err = 0;
 
@@ -1143,9 +1142,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
         struct dsa_slave_priv *p;
         int ret;
 
-        master = ds->dst->master_netdev;
-        if (ds->master_netdev)
-                master = ds->master_netdev;
+        master = ds->dst->cpu_dp->netdev;
 
         slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
                                  NET_NAME_UNKNOWN, ether_setup);