Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 945eb313 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: flow control doesn't re-enable 



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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6534799

drivers/net/e1000e/ethtool.c

+10 −2
Original line number Diff line number Diff line
@@ -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;

}