net: dsa: suppress device links to LAG DSA masters

These don't work (print a harmless error about the operation failing)
and make little sense to have anyway, because when a LAG DSA master goes
away, we will introduce logic to move our CPU port back to the first
physical DSA master. So suppress these device links in preparation for
adding support for LAG DSA masters.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/dsa/master.c b/net/dsa/master.c
index 99d773b242239713230d2c9b3b90b70c466b06e1..2176c14b97a813523f2446b4d2c1c80b85f64c7d 100644 (file)
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -364,12 +364,14 @@ int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
        mtu = ETH_DATA_LEN + dsa_tag_protocol_overhead(tag_ops);
 
        /* The DSA master must use SET_NETDEV_DEV for this to work. */
-       consumer_link = device_link_add(ds->dev, dev->dev.parent,
-                                       DL_FLAG_AUTOREMOVE_CONSUMER);
-       if (!consumer_link)
-               netdev_err(dev,
-                          "Failed to create a device link to DSA switch %s\n",
-                          dev_name(ds->dev));
+       if (!netif_is_lag_master(dev)) {
+               consumer_link = device_link_add(ds->dev, dev->dev.parent,
+                                               DL_FLAG_AUTOREMOVE_CONSUMER);
+               if (!consumer_link)
+                       netdev_err(dev,
+                                  "Failed to create a device link to DSA switch %s\n",
+                                  dev_name(ds->dev));
+       }
 
        /* The switch driver may not implement ->port_change_mtu(), case in
         * which dsa_slave_change_mtu() will not update the master MTU either,