From: Jacob Keller Date: Mon, 6 Feb 2017 22:38:43 +0000 (-0800) Subject: i40e: remove redundant check for fd_tcp_rule when restoring filters X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e122eb7482d4af67bec77055ca2a9009867491e9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git i40e: remove redundant check for fd_tcp_rule when restoring filters i40e_fdir_filter_restore re-adds all existing filters, which already checks when adding a TCPv4 filter to disable ATR. We don't need to make the check twice, so remove this redundant code. Change-ID: Ia0b0690e23523915199d601494557def135c9d7f Signed-off-by: Jacob Keller Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 6e63459ceb65..221e1705c031 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -5466,12 +5466,6 @@ static int i40e_up_complete(struct i40e_vsi *vsi) if (vsi->type == I40E_VSI_FDIR) { /* reset fd counters */ pf->fd_add_err = pf->fd_atr_cnt = 0; - if (pf->fd_tcp_rule > 0) { - pf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED; - if (I40E_DEBUG_FD & pf->hw.debug_mask) - dev_info(&pf->pdev->dev, "Forcing ATR off, sideband rules for TCP/IPv4 exist\n"); - pf->fd_tcp_rule = 0; - } i40e_fdir_filter_restore(vsi); }