diff options
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index 5cc27fba8ad5..babb7e6a66bd 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c | |||
| @@ -445,14 +445,16 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, | |||
| 445 | */ | 445 | */ |
| 446 | if (fcnt_prog >= (fcnt_avail - I40E_FDIR_BUFFER_FULL_MARGIN)) { | 446 | if (fcnt_prog >= (fcnt_avail - I40E_FDIR_BUFFER_FULL_MARGIN)) { |
| 447 | /* Turn off ATR first */ | 447 | /* Turn off ATR first */ |
| 448 | if (pf->flags & I40E_FLAG_FD_ATR_ENABLED) { | 448 | if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) && |
| 449 | pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED; | 449 | !(pf->auto_disable_flags & |
| 450 | I40E_FLAG_FD_ATR_ENABLED)) { | ||
| 450 | dev_warn(&pdev->dev, "FD filter space full, ATR for further flows will be turned off\n"); | 451 | dev_warn(&pdev->dev, "FD filter space full, ATR for further flows will be turned off\n"); |
| 451 | pf->auto_disable_flags |= | 452 | pf->auto_disable_flags |= |
| 452 | I40E_FLAG_FD_ATR_ENABLED; | 453 | I40E_FLAG_FD_ATR_ENABLED; |
| 453 | pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT; | 454 | pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT; |
| 454 | } else if (pf->flags & I40E_FLAG_FD_SB_ENABLED) { | 455 | } else if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) && |
| 455 | pf->flags &= ~I40E_FLAG_FD_SB_ENABLED; | 456 | !(pf->auto_disable_flags & |
| 457 | I40E_FLAG_FD_SB_ENABLED)) { | ||
| 456 | dev_warn(&pdev->dev, "FD filter space full, new ntuple rules will not be added\n"); | 458 | dev_warn(&pdev->dev, "FD filter space full, new ntuple rules will not be added\n"); |
| 457 | pf->auto_disable_flags |= | 459 | pf->auto_disable_flags |= |
| 458 | I40E_FLAG_FD_SB_ENABLED; | 460 | I40E_FLAG_FD_SB_ENABLED; |