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

Commit 13fd9774 authored Sep 28, 2013 by Shannon Nelson Committed by Jeff Kirsher Oct 22, 2013

i40e: use pf_id for pf function id in qtx_ctl



Simplify code by using an already existing variable.

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 59072ba1

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2174,8 +2174,8 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring)

		/* Now associate this queue with this PCI function */
		qtx_ctl = I40E_QTX_CTL_PF_QUEUE;
		qtx_ctl \|= ((hw->hmc.hmc_fn_id << I40E_QTX_CTL_PF_INDX_SHIFT)
		& I40E_QTX_CTL_PF_INDX_MASK);
		qtx_ctl \|= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT) &
		I40E_QTX_CTL_PF_INDX_MASK);
		wr32(hw, I40E_QTX_CTL(pf_q), qtx_ctl);
		i40e_flush(hw);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_idx,

		/* associate this queue with the PCI VF function */
		qtx_ctl = I40E_QTX_CTL_VF_QUEUE;
		qtx_ctl \|= ((hw->hmc.hmc_fn_id << I40E_QTX_CTL_PF_INDX_SHIFT)
		qtx_ctl \|= ((hw->pf_id << I40E_QTX_CTL_PF_INDX_SHIFT)
		& I40E_QTX_CTL_PF_INDX_MASK);
		qtx_ctl \|= (((vf->vf_id + hw->func_caps.vf_base_id)
		<< I40E_QTX_CTL_VFVM_INDX_SHIFT)