ixgbe: don't clear IPsec sa counters on HW clearing

Shannon Nelson · Jeff Kirsher · commit 9e3f2f5ecee6 · 2018-08-28T14:32:22.000-07:00
The software SA record counters should not be cleared when clearing the hardware tables. This causes the counters to be out of sync after a driver reset. Fixes: 63a67fe ("ixgbe: add ipsec offload add and remove SA") Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -113,7 +113,6 @@ static void ixgbe_ipsec_set_rx_ip(struct ixgbe_hw *hw, u16 idx, __be32 addr[])
  **/
 static void ixgbe_ipsec_clear_hw_tables(struct ixgbe_adapter *adapter)
 {
-	struct ixgbe_ipsec *ipsec = adapter->ipsec;
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32 buf[4] = {0, 0, 0, 0};
 	u16 idx;
@@ -132,9 +131,6 @@ static void ixgbe_ipsec_clear_hw_tables(struct ixgbe_adapter *adapter)
 		ixgbe_ipsec_set_tx_sa(hw, idx, buf, 0);
 		ixgbe_ipsec_set_rx_sa(hw, idx, 0, buf, 0, 0, 0);
 	}
-
-	ipsec->num_rx_sa = 0;
-	ipsec->num_tx_sa = 0;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ static void ixgbe_ipsec_set_rx_ip(struct ixgbe_hw *hw, u16 idx, __be32 addr[])`
`113`	`113`	`**/`
`114`	`114`	`static void ixgbe_ipsec_clear_hw_tables(struct ixgbe_adapter *adapter)`
`115`	`115`	`{`
`116`		`- struct ixgbe_ipsec *ipsec = adapter->ipsec;`
`117`	`116`	`struct ixgbe_hw *hw = &adapter->hw;`
`118`	`117`	`u32 buf[4] = {0, 0, 0, 0};`
`119`	`118`	`u16 idx;`
`@@ -132,9 +131,6 @@ static void ixgbe_ipsec_clear_hw_tables(struct ixgbe_adapter *adapter)`
`132`	`131`	`ixgbe_ipsec_set_tx_sa(hw, idx, buf, 0);`
`133`	`132`	`ixgbe_ipsec_set_rx_sa(hw, idx, 0, buf, 0, 0, 0);`
`134`	`133`	`}`
`135`		`-`
`136`		`- ipsec->num_rx_sa = 0;`
`137`		`- ipsec->num_tx_sa = 0;`
`138`	`134`	`}`
`139`	`135`
`140`	`136`	`/**`