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

Commit 89132783 authored Apr 09, 2014 by Anjali Singhai Jain Committed by Jeff Kirsher May 29, 2014

i40e: Use the new i40e_get_fd_cnt_all function in other places

We have a function to calculate this, so update the code to use the function.

Change-ID: Ia345b6fe6ec7f0b2dcf1199471b0d0f959ad3908
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 082def10

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4712,8 +4712,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf)
	(pf->flags & I40E_FLAG_FD_SB_ENABLED))		(pf->flags & I40E_FLAG_FD_SB_ENABLED))
	return;		return;
	fcnt_prog = i40e_get_current_fd_count(pf);		fcnt_prog = i40e_get_current_fd_count(pf);
	fcnt_avail = pf->hw.fdir_shared_filter_count +		fcnt_avail = i40e_get_fd_cnt_all(pf);
	pf->fdir_pf_filter_count;
	if (fcnt_prog < (fcnt_avail - I40E_FDIR_BUFFER_HEAD_ROOM)) {		if (fcnt_prog < (fcnt_avail - I40E_FDIR_BUFFER_HEAD_ROOM)) {
	if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&		if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&
	(pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {		(pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {

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

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -451,9 +451,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,

	/* filter programming failed most likely due to table full */		/* filter programming failed most likely due to table full */
	fcnt_prog = i40e_get_current_fd_count(pf);		fcnt_prog = i40e_get_current_fd_count(pf);
	fcnt_avail = pf->hw.fdir_shared_filter_count +		fcnt_avail = i40e_get_fd_cnt_all(pf);
	pf->fdir_pf_filter_count;

	/* If ATR is running fcnt_prog can quickly change,		/* If ATR is running fcnt_prog can quickly change,
	* if we are very close to full, it makes sense to disable		* if we are very close to full, it makes sense to disable
	* FD ATR/SB and then re-enable it when there is room.		* FD ATR/SB and then re-enable it when there is room.