e1000e: flow control doesn't re-enable
Subsystems (2)
PATCH 1/1 e1000e: flow control doesn't re-enable
From: Bruce Allan <[email protected]>
When changing flow control (pause) parameters, the flow control thresholds (i.e. when to send XON/XOFF frames) may not be setup correctly on parts with copper media. Call the existing e1000_set_fc_watermarks() function to set these thresholds.
Signed-off-by Bruce Allan <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/e1000e/ethtool.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/e1000e/ethtool.c +10 -2
@@ -335,10 +335,18 @@ static int e1000_set_pauseparam(struct net_device *netdev, hw->fc.current_mode = hw->fc.requested_mode; - retval = ((hw->phy.media_type == e1000_media_type_fiber) ? - hw->mac.ops.setup_link (hw) :e1000e_force_mac_fc (hw)); +if (hw->phy.media_type == e1000_media_type_fiber) { + retval = hw->mac.ops.setup_link (hw); +/* implicit goto out */ + }else { + retval =e1000e_force_mac_fc (hw); +if (retval) + goto out; +e1000e_set_fc_watermarks (hw); + } } +out:clear_bit (__E1000_RESETTING, &adapter->state);return retval; }
From: Jeff Kirsher <[email protected]>
Date: Wed, 28 Oct 2009 21:28:30 -0700
Quoted 9 lines
From: Bruce Allan <[email protected]>
When changing flow control (pause) parameters, the flow control thresholds (i.e. when to send XON/XOFF frames) may not be setup correctly on parts with copper media. Call the existing
e1000_set_fc_watermarks()function to set these thresholds.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.