Revert "dpaa2-eth: do not hold rtnl_lock on phylink_create() or _destroy()"

This reverts commit 62cae88f4a6565f72b885298354cebd79e4ad8a5.

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 92dcf71..fbeaa20 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -4135,10 +4135,12 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
                dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
                dpaa2_eth_update_tx_fqids(priv);
 
+               rtnl_lock();
                if (priv->mac)
                        dpaa2_eth_disconnect_mac(priv);
                else
                        dpaa2_eth_connect_mac(priv);
+               rtnl_unlock();
        }
 
        return IRQ_HANDLED;
@@ -4428,7 +4430,9 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)
 #ifdef CONFIG_DEBUG_FS
        dpaa2_dbg_remove(priv);
 #endif
+       rtnl_lock();
        dpaa2_eth_disconnect_mac(priv);
+       rtnl_unlock();
 
        unregister_netdev(net_dev);
 

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 977776c..828c177 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -373,9 +373,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
        if (mac->pcs)
                phylink_set_pcs(mac->phylink, &mac->pcs->pcs);
 
-       rtnl_lock();
        err = phylink_of_phy_connect(mac->phylink, dpmac_node, 0);
-       rtnl_unlock();
        if (err) {
                netdev_err(net_dev, "phylink_of_phy_connect() = %d\n", err);
                goto err_phylink_destroy;
@@ -401,9 +399,7 @@ void dpaa2_mac_disconnect(struct dpaa2_mac *mac)
        if (!mac->phylink)
                return;
 
-       rtnl_lock();
        phylink_disconnect_phy(mac->phylink);
-       rtnl_unlock();
        phylink_destroy(mac->phylink);
        dpaa2_pcs_destroy(mac);