Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains fixes to e1000e, igb, ixgbe, ixgebvf, i40e and
i40evf.

David provides a fix for e1000e to resolve an issue where the device is
capable of transmitting packets but is unable to receive packets until
a previously introduced workaround is called.

Jakub Kicinski provides PTP fixes for ixgbe, which include removing a
redundant if clause and make sure we are not generating both a software and
hardware timestamp.  As well as fix a race condition and leaking skbs
when multiple transmit rings try to claim time stamping.

Jean Sacren fixes a function declaration in ixgbe which was introduced
in commit c97506ab ("ixgbe: Add check for FW veto bit").  In addition
fixes a function header comment in i40e and fixes the error checking
by binding the check to the pertinent DMA bit mask.

Mark provides several fixes for ixgbe and ixgbevf.  Most notably are fixes
to resolve namespace issues and fix ECU warnings induced by LER for ixgbe
and ixgbevf.

Joe Perches fixes up unnecessary casts in i40e and i40evf.

Peter Senna Tschudin fixes igb to use pci_iounmap when the virtual mapping
was done with pci_iomap.
====================# Please enter a commit message to explain why this merge is necessary,
parents 0b70195e bc0c7151

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

+15 −5
Original line number Diff line number Diff line
@@ -2991,11 +2991,21 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
	u32 rctl, rfctl;

	u32 pages = 0;



	/* Workaround Si errata on PCHx - configure jumbo frame flow */

	if ((hw->mac.type >= e1000_pch2lan) &&

	    (adapter->netdev->mtu > ETH_DATA_LEN) &&

	    e1000_lv_jumbo_workaround_ich8lan(hw, true))

		e_dbg("failed to enable jumbo frame workaround mode\n");

	/* Workaround Si errata on PCHx - configure jumbo frame flow.

	 * If jumbo frames not set, program related MAC/PHY registers

	 * to h/w defaults

	 */

	if (hw->mac.type >= e1000_pch2lan) {

		s32 ret_val;



		if (adapter->netdev->mtu > ETH_DATA_LEN)

			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);

		else

			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);



		if (ret_val)

			e_dbg("failed to enable|disable jumbo frame workaround mode\n");

	}



	/* Program MC offset vector base */

	rctl = er32(RCTL);

drivers/net/ethernet/intel/i40e/i40e_common.c

+2 −2
Original line number Diff line number Diff line
@@ -1775,9 +1775,9 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 
	cap = (struct i40e_aqc_list_capabilities_element_resp *) buff;



	if (list_type_opc == i40e_aqc_opc_list_dev_capabilities)

		p = (struct i40e_hw_capabilities *)&hw->dev_caps;

		p = &hw->dev_caps;

	else if (list_type_opc == i40e_aqc_opc_list_func_capabilities)

		p = (struct i40e_hw_capabilities *)&hw->func_caps;

		p = &hw->func_caps;

	else

		return;

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int i40e_get_eeprom(struct net_device *netdev, 
		ret_val = i40e_aq_read_nvm(hw, 0x0,

				eeprom->offset + (I40E_NVM_SECTOR_SIZE * i),

				len,

				(u8 *)eeprom_buff + (I40E_NVM_SECTOR_SIZE * i),

				eeprom_buff + (I40E_NVM_SECTOR_SIZE * i),

				last, NULL);

		if (ret_val) {

			dev_info(&pf->pdev->dev,
@@ -408,7 +408,7 @@ static int i40e_get_eeprom(struct net_device *netdev, 


release_nvm:

	i40e_release_nvm(hw);

	memcpy(bytes, (u8 *)eeprom_buff, eeprom->len);

	memcpy(bytes, eeprom_buff, eeprom->len);

free_buff:

	kfree(eeprom_buff);

	return ret_val;

drivers/net/ethernet/intel/i40e/i40e_main.c

+6 −5
Original line number Diff line number Diff line
@@ -8091,13 +8091,14 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* set up for high or low dma */

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err)

	if (err) {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (err) {

			dev_err(&pdev->dev,

				"DMA configuration failed: 0x%x\n", err);

			goto err_dma;

		}

	}



	/* set up pci connections */

	err = pci_request_selected_regions(pdev, pci_select_bars(pdev,

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
 * @raw_packet: the pre-allocated packet buffer for FDir

 * @add: true adds a filter, false removes it

 *

 * Returns 0 if the filters were successfully added or removed

 * Always returns -EOPNOTSUPP

 **/

static int i40e_add_del_fdir_sctpv4(struct i40e_vsi *vsi,

				    struct i40e_fdir_filter *fd_data,