Commit 1141bfef authored by David S. Miller's avatar David S. Miller
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 2021-04-13

This series contains updates to ixgbe and ixgbevf driver.

Jostar Yang adds support for BCM54616s PHY for ixgbe.

Chen Lin removes an unused function pointer for ixgbe and ixgbevf.

Bhaskar Chowdhury fixes a typo in ixgbe.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f4da5652 ce2cb12d

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
	}



#ifdef IXGBE_FCOE

	/* Reprogam FCoE hardware offloads when the traffic class

	/* Reprogram FCoE hardware offloads when the traffic class

	 * FCoE is using changes. This happens if the APP info

	 * changes or the up2tc mapping is updated.

	 */

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+3 −0
Original line number Diff line number Diff line
@@ -380,6 +380,9 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) 
	case X557_PHY_ID2:

		phy_type = ixgbe_phy_x550em_ext_t;

		break;

	case BCM54616S_E_PHY_ID:

		phy_type = ixgbe_phy_ext_1g_t;

		break;

	default:

		phy_type = ixgbe_phy_unknown;

		break;

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+1 −4
Original line number Diff line number Diff line
@@ -1407,6 +1407,7 @@ struct ixgbe_nvm_version { 
#define QT2022_PHY_ID    0x0043A400

#define ATH_PHY_ID       0x03429050

#define AQ_FW_REV        0x20

#define BCM54616S_E_PHY_ID 0x03625D10



/* Special PHY Init Routine */

#define IXGBE_PHY_INIT_OFFSET_NL 0x002B
@@ -3383,10 +3384,6 @@ struct ixgbe_hw_stats { 
/* forward declaration */

struct ixgbe_hw;



/* iterator type for walking multicast address lists */

typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,

				  u32 *vmdq);



/* Function pointer table */

struct ixgbe_eeprom_operations {

	s32 (*init_params)(struct ixgbe_hw *);

drivers/net/ethernet/intel/ixgbevf/vf.h

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


struct ixgbe_hw;



/* iterator type for walking multicast address lists */

typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,

				  u32 *vmdq);

struct ixgbe_mac_operations {

	s32 (*init_hw)(struct ixgbe_hw *);

	s32 (*reset_hw)(struct ixgbe_hw *);