Commit 3132f0e8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2025-09-03 (ixgbe, igbvf, e1000, e1000e, igb, igbvf, igc)

Piotr allows for 2.5Gb and 5Gb autoneg for ixgbe E610 devices.

Jedrzej refactors reading of OROM data to be more efficient on ixgbe.

Kohei Enju adds reporting of loopback Tx packets and bytes on igbvf. He
also removes redundant reporting of Rx bytes.

Jacek Kowalski remove unnecessary u16 casts in e1000, e1000e, igb, igc,
and ixgbe drivers.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ixgbe: drop unnecessary casts to u16 / int
  igc: drop unnecessary constant casts to u16
  igb: drop unnecessary constant casts to u16
  e1000e: drop unnecessary constant casts to u16
  e1000: drop unnecessary constant casts to u16
  igbvf: remove redundant counter rx_long_byte_count from ethtool statistics
  igbvf: add lbtx_packets and lbtx_bytes to ethtool statistics
  ixgbe: reduce number of reads when getting OROM data
  ixgbe: add the 2.5G and 5G speeds in auto-negotiation for E610
====================

Link: https://patch.msgid.link/20250903202536.3696620-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d9c74e6f 396a788b

drivers/net/ethernet/intel/e1000/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct e1000_adapter; 
#define E1000_MASTER_SLAVE	e1000_ms_hw_default

#endif



#define E1000_MNG_VLAN_NONE	(-1)

#define E1000_MNG_VLAN_NONE	0xFFFF



/* wrapper around a pointer to a socket buffer,

 * so a DMA handle can be stored along with the buffer

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

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data) 
	}



	/* If Checksum is not Correct return error else test passed */

	if ((checksum != (u16)EEPROM_SUM) && !(*data))

	if (checksum != EEPROM_SUM && !(*data))

		*data = 2;



	return *data;

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

+2 −2
Original line number Diff line number Diff line
@@ -3970,7 +3970,7 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw) 
		return E1000_SUCCESS;



#endif

	if (checksum == (u16)EEPROM_SUM)

	if (checksum == EEPROM_SUM)

		return E1000_SUCCESS;

	else {

		e_dbg("EEPROM Checksum Invalid\n");
@@ -3997,7 +3997,7 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw) 
		}

		checksum += eeprom_data;

	}

	checksum = (u16)EEPROM_SUM - checksum;

	checksum = EEPROM_SUM - checksum;

	if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {

		e_dbg("EEPROM Write Error\n");

		return -E1000_ERR_EEPROM;

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

+1 −2
Original line number Diff line number Diff line
@@ -313,8 +313,7 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter) 
		} else {

			adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;

		}

		if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&

		    (vid != old_vid) &&

		if (old_vid != E1000_MNG_VLAN_NONE && vid != old_vid &&

		    !test_bit(old_vid, adapter->active_vlans))

			e1000_vlan_rx_kill_vid(netdev, htons(ETH_P_8021Q),

					       old_vid);

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct e1000_info; 
#define AUTO_ALL_MODES			0

#define E1000_EEPROM_APME		0x0400



#define E1000_MNG_VLAN_NONE		(-1)

#define E1000_MNG_VLAN_NONE		0xFFFF



#define DEFAULT_JUMBO			9234