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

Commit 0bf4b1b0 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: Remove unnecessary pf members 



We can use the stat index macro directly, a variable is not required.

Change-ID: I19f08ac16353dc0cd87a1a8248d714e15a54aa8a
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 60ccd45c

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

+0 −2
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ struct i40e_pf { 


	struct hlist_head fdir_filter_list;

	u16 fdir_pf_active_filters;

	u16 fd_sb_cnt_idx;

	u16 fd_atr_cnt_idx;

	unsigned long fd_flush_timestamp;

	u32 fd_flush_cnt;

	u32 fd_add_err;

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

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
	input->pctype = 0;

	input->dest_vsi = vsi->id;

	input->fd_status = I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID;

	input->cnt_index  = pf->fd_sb_cnt_idx;

	input->cnt_index  = I40E_FD_SB_STAT_IDX(pf->hw.pf_id);

	input->flow_type = fsp->flow_type;

	input->ip4_proto = fsp->h_u.usr_ip4_spec.proto;

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

+4 −6
Original line number Diff line number Diff line
@@ -1096,10 +1096,12 @@ static void i40e_update_pf_stats(struct i40e_pf *pf) 
			   &osd->rx_jabber, &nsd->rx_jabber);



	/* FDIR stats */

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_atr_cnt_idx),

	i40e_stat_update32(hw,

			   I40E_GLQF_PCNT(I40E_FD_ATR_STAT_IDX(pf->hw.pf_id)),

			   pf->stat_offsets_loaded,

			   &osd->fd_atr_match, &nsd->fd_atr_match);

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_sb_cnt_idx),

	i40e_stat_update32(hw,

			   I40E_GLQF_PCNT(I40E_FD_SB_STAT_IDX(pf->hw.pf_id)),

			   pf->stat_offsets_loaded,

			   &osd->fd_sb_match, &nsd->fd_sb_match);

	i40e_stat_update32(hw,
@@ -7679,12 +7681,8 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	    (pf->hw.func_caps.fd_filters_best_effort > 0)) {

		pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

		pf->atr_sample_rate = I40E_DEFAULT_ATR_SAMPLE_RATE;

		/* Setup a counter for fd_atr per PF */

		pf->fd_atr_cnt_idx = I40E_FD_ATR_STAT_IDX(pf->hw.pf_id);

		if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) {

			pf->flags |= I40E_FLAG_FD_SB_ENABLED;

			/* Setup a counter for fd_sb per PF */

			pf->fd_sb_cnt_idx = I40E_FD_SB_STAT_IDX(pf->hw.pf_id);

		} else {

			dev_info(&pf->pdev->dev,

				 "Flow Director Sideband mode Disabled in MFP mode\n");