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

Commit e8c5f723 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e: Swap use of pf->flags and pf->hw_disabled_flags for ATR Eviction 



This is a minor cleanup so that we are always updating pf->flags when we
make a change to the private flags instead of updating a mix of either
pf->flags and/or pf->hw_disabled_flags.

In addition I went through and cleaned out all the spots where we were
using the X722 define in regards to this flag.

Lastly since we changed the logic I went through and flushed out any
redundancy and cleaned up the handling of the flags in the Tx path.

Change-ID: I79ff95a7272bb2533251ff11ef91e89ccb80b610
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a346fb83

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

+2 −4
Original line number Diff line number Diff line
@@ -2263,8 +2263,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	/* Due to lack of space, no more new filters can be programmed */

	if (th->syn && (pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED))

		return;

	if ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&

	    (!(pf->hw_disabled_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))) {

	if (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) {

		/* HW ATR eviction will take care of removing filters on FIN

		 * and RST packets.

		 */
@@ -2326,8 +2325,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
			I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			I40E_TXD_FLTR_QW1_CNTINDEX_MASK;



	if ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&

	    (!(pf->hw_disabled_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)))

	if (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)

		dtype_cmd |= I40E_TXD_FLTR_QW1_ATR_MASK;



	fdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);