Ver código fonte

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

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Bruce Allan 13 anos atrás
pai
commit
b20caa80e8

+ 3 - 1
drivers/net/ethernet/intel/e1000e/mac.c

@@ -969,7 +969,9 @@ s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
 		 * XON frames.
 		 * XON frames.
 		 */
 		 */
 		fcrtl = hw->fc.low_water;
 		fcrtl = hw->fc.low_water;
-		fcrtl |= E1000_FCRTL_XONE;
+		if (hw->fc.send_xon)
+			fcrtl |= E1000_FCRTL_XONE;
+
 		fcrth = hw->fc.high_water;
 		fcrth = hw->fc.high_water;
 	}
 	}
 	ew32(FCRTL, fcrtl);
 	ew32(FCRTL, fcrtl);

+ 1 - 1
drivers/net/ethernet/intel/e1000e/netdev.c

@@ -3464,7 +3464,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
 		fc->pause_time = 0xFFFF;
 		fc->pause_time = 0xFFFF;
 	else
 	else
 		fc->pause_time = E1000_FC_PAUSE_TIME;
 		fc->pause_time = E1000_FC_PAUSE_TIME;
-	fc->send_xon = 1;
+	fc->send_xon = true;
 	fc->current_mode = fc->requested_mode;
 	fc->current_mode = fc->requested_mode;
 
 
 	switch (hw->mac.type) {
 	switch (hw->mac.type) {