Commit 1cebc3ca authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2022-06-30

This series contains updates to misc Intel drivers.

Jesse removes unused macros from e100, e1000, e1000e, i40e, iavf, igc,
ixgb, ixgbe, and ixgbevf drivers.

Jiang Jian removes repeated words from ixgbe, fm10k, igb, and ixgbe
drivers.

Jilin Yuan removes repeated words from e1000, e1000e, fm10k, i40e, iavf,
igb, igbvf, igc, ixgbevf, and ice drivers.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  intel/ice:fix repeated words in comments
  intel/ixgbevf:fix repeated words in comments
  intel/igc:fix repeated words in comments
  intel/igbvf:fix repeated words in comments
  intel/igb:fix repeated words in comments
  intel/iavf:fix repeated words in comments
  intel/i40e:fix repeated words in comments
  intel/fm10k:fix repeated words in comments
  intel/e1000e:fix repeated words in comments
  intel/e1000:fix repeated words in comments
  ixgbe: drop unexpected word 'for' in comments
  igb: remove unexpected word "the"
  fm10k: remove unexpected word "the"
  ixgbe: remove unexpected word "the"
  intel: remove unused macros
====================

Link: https://lore.kernel.org/r/20220630213208.3034968-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0d8730f0 173e468c

drivers/net/ethernet/intel/e100.c

+0 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,6 @@ static int e100_phy_check_without_mii(struct nic *nic) 
#define MII_NSC_CONG		MII_RESV1

#define NSC_CONG_ENABLE		0x0100

#define NSC_CONG_TXREADY	0x0400

#define ADVERTISE_FC_SUPPORTED	0x0400

static int e100_phy_init(struct nic *nic)

{

	struct net_device *netdev = nic->netdev;

drivers/net/ethernet/intel/e1000/e1000_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ s32 e1000_force_mac_fc(struct e1000_hw *hw) 
	 *      1:  Rx flow control is enabled (we can receive pause

	 *          frames but not send pause frames).

	 *      2:  Tx flow control is enabled (we can send pause frames

	 *          frames but we do not receive pause frames).

	 *          but we do not receive pause frames).

	 *      3:  Both Rx and TX flow control (symmetric) is enabled.

	 *  other:  No other values should be possible at this point.

	 */

drivers/net/ethernet/intel/e1000/e1000_param.c

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ E1000_PARAM(Duplex, "Duplex setting"); 
 */

E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting");

#define AUTONEG_ADV_DEFAULT  0x2F

#define AUTONEG_ADV_MASK     0x2F



/* User Specified Flow Control Override

 *
@@ -95,7 +94,6 @@ E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting"); 
 * Default Value: Read flow control settings from the EEPROM

 */

E1000_PARAM(FlowControl, "Flow Control setting");

#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL



/* XsumRX - Receive Checksum Offload Enable/Disable

 *

drivers/net/ethernet/intel/e1000e/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ s32 e1000e_force_mac_fc(struct e1000_hw *hw) 
	 *      1:  Rx flow control is enabled (we can receive pause

	 *          frames but not send pause frames).

	 *      2:  Tx flow control is enabled (we can send pause frames

	 *          frames but we do not receive pause frames).

	 *          but we do not receive pause frames).

	 *      3:  Both Rx and Tx flow control (symmetric) is enabled.

	 *  other:  No other values should be possible at this point.

	 */

drivers/net/ethernet/intel/e1000e/param.c

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate"); 
 * demoted to the most advanced interrupt mode available.

 */

E1000_PARAM(IntMode, "Interrupt Mode");

#define MAX_INTMODE	2

#define MIN_INTMODE	0



/* Enable Smart Power Down of the PHY

 *