e1000e: use true/false for boolean send_xon, do not assume always true

Signed-off-by: Bruce Allan <[email protected]>
Tested-by: Aaron Brown <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 4130134b0d322e34dc2c9e0917be48a7f412c83f..d55f5887b07a5ac55b0e5e87de7e08c38446cce0 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -969,7 +969,9 @@ s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
                 * XON frames.
                 */
                fcrtl = hw->fc.low_water;
-               fcrtl |= E1000_FCRTL_XONE;
+               if (hw->fc.send_xon)
+                       fcrtl |= E1000_FCRTL_XONE;
+
                fcrth = hw->fc.high_water;
        }
        ew32(FCRTL, fcrtl);

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 56c1aec65186535afcbb8aebf4866c7f39a3b407..8b62870e2c25a08b3b6d701abbc5247628e1784e 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3464,7 +3464,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                fc->pause_time = 0xFFFF;
        else
                fc->pause_time = E1000_FC_PAUSE_TIME;
-       fc->send_xon = 1;
+       fc->send_xon = true;
        fc->current_mode = fc->requested_mode;
 
        switch (hw->mac.type) {