diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-19 12:35:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-20 13:53:24 -0800 |
| commit | 29afd690636dab36fe437c54b3a9d5e093bdcd9b (patch) | |
| tree | 42db5a68f6e3d8b27226cf46aad7376f930fec9e /drivers/net/e1000e | |
| parent | 842ec8b64ac34e9b245da31b4a5a49c3e744a714 (diff) | |
| download | op-kernel-dev-29afd690636dab36fe437c54b3a9d5e093bdcd9b.zip op-kernel-dev-29afd690636dab36fe437c54b3a9d5e093bdcd9b.tar.gz | |
e1000e: set flow control thresholds properly after enabling/disabling pause
When flow control (pause) parameters were changed via ethtool (i.e. enabled
or disabled), the newly calculated thresholds were not being written to the
device for non-fiber media.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/ethtool.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 1bf4d2a..e82638e 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c @@ -327,10 +327,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; } |
