Commit ed97143e authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2021-03-23

This series contains updates to ice, fm10k, i40e, iavf, ixgbe, ixgbevf,
igb, e1000e, and e1000 drivers.

Tony fixes prototype warnings for mismatched header for ice driver.

Sasha fixes prototype warnings for mismatched header for igc and e1000e
driver.

Jesse fixes prototype warnings for mismatched header for the remaining
Intel drivers: fm10k, i40e, iavf, igb, ixgbe, and ixgbevf.

Gustavo A. R. Silva explicitly adds a break instead of falling through
in preparation of -Wimplicit-fallthrough for Clang to ice, fm10k,
ixgbe, igb, ixgbevf, and e1000 drivers,
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c692a0be 67831a08

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

+1 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw) 
			break;

		case e1000_ms_auto:

			phy_data &= ~CR_1000T_MS_ENABLE;

			break;

		default:

			break;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -2745,7 +2745,7 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw) 
}



/**

 *  e1000_k1_gig_workaround_lv - K1 Si workaround

 *  e1000_k1_workaround_lv - K1 Si workaround

 *  @hw:   pointer to the HW structure

 *

 *  Workaround to set the K1 beacon duration for 82579 parts in 10Mbps
@@ -5220,7 +5220,7 @@ void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw, 
}



/**

 *  e1000_ipg3_phy_powerdown_workaround_ich8lan - Power down workaround on D3

 *  e1000e_igp3_phy_powerdown_workaround_ich8lan - Power down workaround on D3

 *  @hw: pointer to the HW structure

 *

 *  Workaround for 82566 power-down on D3 entry:

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

+3 −3
Original line number Diff line number Diff line
@@ -5987,7 +5987,7 @@ static void e1000_reset_task(struct work_struct *work) 
}



/**

 * e1000_get_stats64 - Get System Network Statistics

 * e1000e_get_stats64 - Get System Network Statistics

 * @netdev: network interface device structure

 * @stats: rtnl_link_stats64 pointer

 *
@@ -6160,7 +6160,7 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, 
}



/**

 * e1000e_hwtstamp_ioctl - control hardware time stamping

 * e1000e_hwtstamp_set - control hardware time stamping

 * @netdev: network interface device structure

 * @ifr: interface request

 *
@@ -6818,7 +6818,7 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) 
}



/**

 * e1000e_disable_aspm_locked   Disable ASPM states.

 * e1000e_disable_aspm_locked - Disable ASPM states.

 * @pdev: pointer to PCI device struct

 * @state: bit-mask of ASPM states to disable

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data) 
}



/**

 *  e1000e_write_phy_reg_igp - Write igp PHY register

 *  __e1000e_write_phy_reg_igp - Write igp PHY register

 *  @hw: pointer to the HW structure

 *  @offset: register offset to write to

 *  @data: data to write at register offset

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

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int e1000e_phc_get_syncdevicetime(ktime_t *device, 
}



/**

 * e1000e_phc_getsynctime - Reads the current system/device cross timestamp

 * e1000e_phc_getcrosststamp - Reads the current system/device cross timestamp

 * @ptp: ptp clock structure

 * @xtstamp: structure containing timestamp

 *