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;
+                }
         }
 
         /*