]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tg3: Remove unnecessary phy reset during ethtool commands
authorNithin Sujir <nsujir@broadcom.com>
Tue, 9 Apr 2013 08:48:03 +0000 (08:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Apr 2013 19:14:14 +0000 (15:14 -0400)
The current code unnecessarily resets the phy when we use ethtool to
change the ring parameters or flow control settings. Remove the phy
reset.

Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c

index a27310dfb03e19c292c858f4edf8a93e43e2b74f..3f0d43f912ec8f2a5a3078921624c0a1b1f2aec9 100644 (file)
@@ -11720,7 +11720,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 
        if (netif_running(dev)) {
                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-               err = tg3_restart_hw(tp, 1);
+               err = tg3_restart_hw(tp, 0);
                if (!err)
                        tg3_netif_start(tp);
        }
@@ -11841,7 +11841,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
 
                if (netif_running(dev)) {
                        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-                       err = tg3_restart_hw(tp, 1);
+                       err = tg3_restart_hw(tp, 0);
                        if (!err)
                                tg3_netif_start(tp);
                }