Commit 68c51dd9 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:

====================
10GbE Intel Wired LAN Driver Updates 2022-06-09

Maximilian Heyne adds reporting of VF statistics on ixgbe via iproute2
interface.

Kai-Heng Feng removes duplicate defines from igb.

Jiaqing Zhao fixes typos in e1000, ixgb, and ixgbe drivers.

Julia Lawall fixes typos for fm10k, ixgbe, and ice drivers.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  drivers/net/ethernet/intel: fix typos in comments
  ixgbe: Fix typos in comments
  ixgb: Fix typos in comments
  e1000: Fix typos in comments
  igb: Remove duplicate defines
  drivers, ixgbe: export vf statistics
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e10b02ee 138f9f50

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

+2 −2
Original line number Diff line number Diff line
@@ -4376,7 +4376,7 @@ void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) 
/**

 * e1000_write_vfta - Writes a value to the specified offset in the VLAN filter table.

 * @hw: Struct containing variables accessed by shared code

 * @offset: Offset in VLAN filer table to write

 * @offset: Offset in VLAN filter table to write

 * @value: Value to write into VLAN filter table

 */

void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
@@ -4396,7 +4396,7 @@ void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value) 
}



/**

 * e1000_clear_vfta - Clears the VLAN filer table

 * e1000_clear_vfta - Clears the VLAN filter table

 * @hw: Struct containing variables accessed by shared code

 */

static void e1000_clear_vfta(struct e1000_hw *hw)

drivers/net/ethernet/intel/fm10k/fm10k_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ static void fm10k_sm_mbx_process_error(struct fm10k_mbx_info *mbx) 
		fm10k_sm_mbx_connect_reset(mbx);

		break;

	case FM10K_STATE_CONNECT:

		/* try connnecting at lower version */

		/* try connecting at lower version */

		if (mbx->remote) {

			while (mbx->local > 1)

				mbx->local--;

drivers/net/ethernet/intel/ice/ice_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2406,7 +2406,7 @@ static void ice_set_agg_vsi(struct ice_vsi *vsi) 
				agg_id);

			return;

		}

		/* aggregator node is created, store the neeeded info */

		/* aggregator node is created, store the needed info */

		agg_node->valid = true;

		agg_node->agg_id = agg_id;

	}

drivers/net/ethernet/intel/igb/e1000_defines.h

+0 −3
Original line number Diff line number Diff line
@@ -1033,9 +1033,6 @@ 
#define E1000_VFTA_ENTRY_MASK                0x7F

#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F



/* DMA Coalescing register fields */

#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power on DMA coal */



/* Tx Rate-Scheduler Config fields */

#define E1000_RTTBCNRC_RS_ENA		0x80000000

#define E1000_RTTBCNRC_RF_DEC_MASK	0x00003FFF

drivers/net/ethernet/intel/igb/e1000_regs.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
#define E1000_DMCRTRH	0x05DD0 /* Receive Packet Rate Threshold */

#define E1000_DMCCNT	0x05DD4 /* Current Rx Count */

#define E1000_FCRTC	0x02170 /* Flow Control Rx high watermark */

#define E1000_PCIEMISC	0x05BB8 /* PCIE misc config register */



/* TX Rate Limit Registers */

#define E1000_RTTDQSEL	0x3604 /* Tx Desc Plane Queue Select - WO */