net: dsa: Fix network device registration order (e804441c) · Commits · 戴 / test

We cannot be registering the network device first, then setting its carrier off and finally connecting it to a PHY, doing that leaves a window during which the carrier is at best inconsistent, and at worse the device is not usable without a down/up sequence since the network device is visible to user space with possibly no PHY device attached. Re-order steps so that they make logical sense. This fixes some devices where the port was not usable after e.g: an unbind then bind of the driver. Fixes: ("dsa: Register netdev before phy") Fixes: ("net: Distributed Switch Architecture protocol support") Signed-off-by:

Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/dsa/slave.c

+18 −13

Original line number	Diff line number	Diff line
		@@ -1301,30 +1301,35 @@ int dsa_slave_create(struct dsa_port port, const char name)
		p->old_duplex = -1;

		port->netdev = slave_dev;

		netif_carrier_off(slave_dev);

		ret = dsa_slave_phy_setup(p, slave_dev);
		if (ret) {
		netdev_err(master, "error %d setting up slave phy\n", ret);
		goto out_free;
		}

		ret = register_netdev(slave_dev);
		if (ret) {
		netdev_err(master, "error %d registering interface %s\n",
		ret, slave_dev->name);
		port->netdev = NULL;
		free_percpu(p->stats64);
		free_netdev(slave_dev);
		return ret;
		goto out_phy;
		}

		netif_carrier_off(slave_dev);
		return 0;

		ret = dsa_slave_phy_setup(p, slave_dev);
		if (ret) {
		netdev_err(master, "error %d setting up slave phy\n", ret);
		unregister_netdev(slave_dev);
		out_phy:
		phy_disconnect(p->phy);
		if (of_phy_is_fixed_link(p->dp->dn))
		of_phy_deregister_fixed_link(p->dp->dn);
		out_free:
		free_percpu(p->stats64);
		free_netdev(slave_dev);
		port->netdev = NULL;
		return ret;
		}

		return 0;
		}

		void dsa_slave_destroy(struct net_device *slave_dev)
		{
		struct dsa_slave_priv *p = netdev_priv(slave_dev);

Admin message