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

Merge branch 'i40e' 



Aaron Brown says:

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

This series contains updates to i40e that are primarily minor fixes or
general cleanup.

Shannon fixes a bug where the VMDq queue is not associated with the
right setup within the hardware.

Mitch provides a patch adjusting where the VF is reset and another
one adding meaningful context to a message.

Jesse cleans up white space comments and parenthesis.

Catherine bumps the version.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b53c7336 962dd666

drivers/net/ethernet/intel/i40e/Module.symvers

0 → 100644
+0 −0

Empty file added.

drivers/net/ethernet/intel/i40e/i40e.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ 
#define I40E_CURRENT_NVM_VERSION_HI 0x2

#define I40E_CURRENT_NVM_VERSION_HI 0x2

#define I40E_CURRENT_NVM_VERSION_LO 0x30

#define I40E_CURRENT_NVM_VERSION_LO 0x30







/* magic for getting defines into strings */

/* magic for getting defines into strings */

#define STRINGIFY(foo)  #foo

#define STRINGIFY(foo)  #foo

#define XSTRINGIFY(bar) STRINGIFY(bar)

#define XSTRINGIFY(bar) STRINGIFY(bar)

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -162,7 +162,6 @@ i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, 
	return status;

	return status;

}

}







/**

/**

 * i40e_init_shared_code - Initialize the shared code

 * i40e_init_shared_code - Initialize the shared code

 * @hw: pointer to hardware structure

 * @hw: pointer to hardware structure

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -485,8 +485,7 @@ i40e_status i40e_configure_lan_hmc(struct i40e_hw *hw, 
		/* Make one big object, a single SD */

		/* Make one big object, a single SD */

		info.count = 1;

		info.count = 1;

		ret_code = i40e_create_lan_hmc_object(hw, &info);

		ret_code = i40e_create_lan_hmc_object(hw, &info);

		if ((ret_code) &&

		if (ret_code && (model == I40E_HMC_MODEL_DIRECT_PREFERRED))

		    (model == I40E_HMC_MODEL_DIRECT_PREFERRED))

			goto try_type_paged;

			goto try_type_paged;

		else if (ret_code)

		else if (ret_code)

			goto configure_lan_hmc_out;

			goto configure_lan_hmc_out;

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static const char i40e_driver_string[] = 




#define DRV_VERSION_MAJOR 0

#define DRV_VERSION_MAJOR 0

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_BUILD 28

#define DRV_VERSION_BUILD 30

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -356,7 +356,6 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct( 
	struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);

	struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);

	int i;

	int i;







	if (test_bit(__I40E_DOWN, &vsi->state))

	if (test_bit(__I40E_DOWN, &vsi->state))

		return stats;

		return stats;
@@ -2206,6 +2205,9 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring) 
	}

	}





	/* Now associate this queue with this PCI function */

	/* Now associate this queue with this PCI function */

	if (vsi->type == I40E_VSI_VMDQ2)

		qtx_ctl = I40E_QTX_CTL_VM_QUEUE;

	else

		qtx_ctl = I40E_QTX_CTL_PF_QUEUE;

		qtx_ctl = I40E_QTX_CTL_PF_QUEUE;

	qtx_ctl |= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) &

	qtx_ctl |= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) &

		    I40E_QTX_CTL_PF_INDX_MASK);

		    I40E_QTX_CTL_PF_INDX_MASK);

CRA Git | Maintained and supported by SUSTech CRA and CCSE