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

Commit d3e9c56c authored by PJ Waskiewicz's avatar PJ Waskiewicz Committed by David S. Miller
Browse files

ixgbe: Don't return error in flow control configuration if FC is off 



When flow control is disabled, an invalid low/high watermark configuration
should not matter.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e80e887a

drivers/net/ixgbe/ixgbe_82598.c

+5 −3
Original line number Diff line number Diff line
@@ -381,10 +381,12 @@ static s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 
	 * because it causes the controller to just blast out fc packets.

	 */

	if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) {

		if (hw->fc.requested_mode != ixgbe_fc_none) {

			hw_dbg(hw, "Invalid water mark configuration\n");

			ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;

			goto out;

		}

	}



	/*

	 * Validate the requested mode.  Strict IEEE mode does not allow

drivers/net/ixgbe/ixgbe_common.c

+5 −3
Original line number Diff line number Diff line
@@ -1907,10 +1907,12 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw, s32 packetbuf_num) 
	 * because it causes the controller to just blast out fc packets.

	 */

	if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) {

		if (hw->fc.requested_mode != ixgbe_fc_none) {

			hw_dbg(hw, "Invalid water mark configuration\n");

			ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;

			goto out;

		}

	}



	/*

	 * Validate the requested mode.  Strict IEEE mode does not allow