Commit 9e196e43 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/net-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-04-14

This series contains updates to ixgbe and ice drivers.

Alex Duyck fixes a NULL pointer dereference for ixgbe.

Yongxin Liu fixes an unbalanced enable/disable which was causing a call
trace with suspend for ixgbe.

Colin King fixes a potential infinite loop for ice.
====================

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

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

+2 −2
Original line number Diff line number Diff line
@@ -747,8 +747,8 @@ ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg, 
		   struct ice_port_info *pi)

{

	u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);

	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift;

	u8 i, j, err, sync, oper, app_index, ice_app_sel_type;

	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift, j;

	u8 i, err, sync, oper, app_index, ice_app_sel_type;

	u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);

	u16 ice_aqc_cee_app_mask, ice_aqc_cee_app_shift;

	struct ice_dcbx_cfg *cmp_dcbcfg, *dcbcfg;

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

+13 −1
Original line number Diff line number Diff line
@@ -6536,6 +6536,13 @@ static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter) 
	return err;

}



static int ixgbe_rx_napi_id(struct ixgbe_ring *rx_ring)

{

	struct ixgbe_q_vector *q_vector = rx_ring->q_vector;



	return q_vector ? q_vector->napi.napi_id : 0;

}



/**

 * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors)

 * @adapter: pointer to ixgbe_adapter
@@ -6583,7 +6590,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter, 


	/* XDP RX-queue info */

	if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,

			     rx_ring->queue_index, rx_ring->q_vector->napi.napi_id) < 0)

			     rx_ring->queue_index, ixgbe_rx_napi_id(rx_ring)) < 0)

		goto err;



	rx_ring->xdp_prog = adapter->xdp_prog;
@@ -6892,6 +6899,11 @@ static int __maybe_unused ixgbe_resume(struct device *dev_d) 


	adapter->hw.hw_addr = adapter->io_addr;



	err = pci_enable_device_mem(pdev);

	if (err) {

		e_dev_err("Cannot enable PCI device from suspend\n");

		return err;

	}

	smp_mb__before_atomic();

	clear_bit(__IXGBE_DISABLED, &adapter->state);

	pci_set_master(pdev);