diff options
| author | PJ Waskiewicz | 2009-04-10 00:27:39 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-04-11 11:48:00 +0200 |
| commit | d3e9c56cafb98040c8601dcc784a773ac86da18b (patch) | |
| tree | f30426aa7370e1d9cc62fbaaec5098c58740bffc /drivers/net | |
| parent | ixgbe: add define to support 82599 64 IVAR registers (diff) | |
| download | kernel-qcow2-linux-d3e9c56cafb98040c8601dcc784a773ac86da18b.tar.gz kernel-qcow2-linux-d3e9c56cafb98040c8601dcc784a773ac86da18b.tar.xz kernel-qcow2-linux-d3e9c56cafb98040c8601dcc784a773ac86da18b.zip | |
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: 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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_82598.c | 8 | ||||
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_common.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c index 63aacd53aab7..1e1d8b79f9e3 100644 --- a/drivers/net/ixgbe/ixgbe_82598.c +++ b/drivers/net/ixgbe/ixgbe_82598.c @@ -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. */ if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) { - hw_dbg(hw, "Invalid water mark configuration\n"); - ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS; - goto out; + 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; + } } /* diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index 846c9deeaa7a..2d4af5d2d3f7 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/drivers/net/ixgbe/ixgbe_common.c @@ -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. */ if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) { - hw_dbg(hw, "Invalid water mark configuration\n"); - ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS; - goto out; + 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; + } } /* |