net: ethernet: ti: am65-cpsw-ethtool: configured critical setting only when no runnin...
authorGrygorii Strashko <grygorii.strashko@ti.com>
Fri, 26 Jun 2020 18:17:08 +0000 (21:17 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Jun 2020 00:06:19 +0000 (17:06 -0700)
Ensure that critical setting can only be configured when there are no
running netdevs - all ports are down.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/am65-cpsw-ethtool.c

index f7b3387..496dafb 100644 (file)
@@ -445,7 +445,7 @@ static int am65_cpsw_set_channels(struct net_device *ndev,
        /* Check if interface is up. Can change the num queues when
         * the interface is down.
         */
-       if (netif_running(ndev))
+       if (common->usage_count)
                return -EBUSY;
 
        am65_cpsw_nuss_remove_tx_chns(common);
@@ -734,6 +734,9 @@ static int am65_cpsw_set_ethtool_priv_flags(struct net_device *ndev, u32 flags)
 
        rrobin = !!(flags & AM65_CPSW_PRIV_P0_RX_PTYPE_RROBIN);
 
+       if (common->usage_count)
+               return -EBUSY;
+
        if (common->est_enabled && rrobin) {
                netdev_err(ndev,
                           "p0-rx-ptype-rrobin flag conflicts with QOS\n");