Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Shannon Nelson 11 years ago
parent
59072ba139
commit
13fd977490
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 2 2
      drivers/net/ethernet/intel/i40e/i40e_main.c
  2. 1 1
      drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+ 2 - 2
drivers/net/ethernet/intel/i40e/i40e_main.c
View File 

@@ -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);

+ 1 - 1
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File 

@@ -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)