Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
PJ Waskiewicz 2009-04-09 22:27:39 +00:00 committed by David S. Miller
parent e80e887a95
commit d3e9c56caf
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ixgbe/ixgbe_82598.c
View file

@ -381,9 +381,11 @@ static s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
* because it causes the controller to just blast out fc packets. * 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.low_water || !hw->fc.high_water || !hw->fc.pause_time) {
hw_dbg(hw, "Invalid water mark configuration\n"); if (hw->fc.requested_mode != ixgbe_fc_none) {
ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS; hw_dbg(hw, "Invalid water mark configuration\n");
goto out; ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
} }
/* /*

8
drivers/net/ixgbe/ixgbe_common.c
View file

@ -1907,9 +1907,11 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
* because it causes the controller to just blast out fc packets. * 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.low_water || !hw->fc.high_water || !hw->fc.pause_time) {
hw_dbg(hw, "Invalid water mark configuration\n"); if (hw->fc.requested_mode != ixgbe_fc_none) {
ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS; hw_dbg(hw, "Invalid water mark configuration\n");
goto out; ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
goto out;
}
} }
/* /*