diff options
| author | Nithin Sujir <nsujir@broadcom.com> | 2013-04-09 08:48:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-09 15:14:14 -0400 |
| commit | f1315d20525f3a0004b5e64a99e0d5f7e377b7e3 (patch) | |
| tree | b83c32e6b654d583d42a0adb72b1e66f852f62a7 /drivers/net/ethernet/broadcom | |
| parent | f6334bb860a890eab2699330930c267bb83e83db (diff) | |
| download | op-kernel-dev-f1315d20525f3a0004b5e64a99e0d5f7e377b7e3.zip op-kernel-dev-f1315d20525f3a0004b5e64a99e0d5f7e377b7e3.tar.gz | |
tg3: Remove unnecessary phy reset during ethtool commands
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index a27310d..3f0d43f 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -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); } |
