aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnjali Singhai Jain <anjali.singhai@intel.com>2014-03-06 03:59:54 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-28 09:53:57 -0400
commitce806783bd43f0cd0631d7b2946d503cb912721f (patch)
tree721ec16a5b92affc10f5ecbc1f82eb243386d59e
parente1250037de22b99694ebfd37b867a3f591b0dc39 (diff)
i40e: Delete ATR filter on RST
We currently delete ATR filter on FIN alone, delete on RST as well. Change-ID: Ie7cae5d1046b9d1d4a0d6ef5bdbf41224c3dade6 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_txrx.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 851f6537a96a..de25a32f927e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1624,8 +1624,11 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,
1624 1624
1625 tx_ring->atr_count++; 1625 tx_ring->atr_count++;
1626 1626
1627 /* sample on all syn/fin packets or once every atr sample rate */ 1627 /* sample on all syn/fin/rst packets or once every atr sample rate */
1628 if (!th->fin && !th->syn && (tx_ring->atr_count < tx_ring->atr_sample_rate)) 1628 if (!th->fin &&
1629 !th->syn &&
1630 !th->rst &&
1631 (tx_ring->atr_count < tx_ring->atr_sample_rate))
1629 return; 1632 return;
1630 1633
1631 tx_ring->atr_count = 0; 1634 tx_ring->atr_count = 0;
@@ -1649,7 +1652,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,
1649 1652
1650 dtype_cmd = I40E_TX_DESC_DTYPE_FILTER_PROG; 1653 dtype_cmd = I40E_TX_DESC_DTYPE_FILTER_PROG;
1651 1654
1652 dtype_cmd |= th->fin ? 1655 dtype_cmd |= (th->fin || th->rst) ?
1653 (I40E_FILTER_PROGRAM_DESC_PCMD_REMOVE << 1656 (I40E_FILTER_PROGRAM_DESC_PCMD_REMOVE <<
1654 I40E_TXD_FLTR_QW1_PCMD_SHIFT) : 1657 I40E_TXD_FLTR_QW1_PCMD_SHIFT) :
1655 (I40E_FILTER_PROGRAM_DESC_PCMD_ADD_UPDATE << 1658 (I40E_FILTER_PROGRAM_DESC_PCMD_ADD_UPDATE <<