diff options
| author |   Edward Cree <ecree@solarflare.com> | 2018-04-27 15:08:57 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-27 20:21:07 -0400 |
| commit | 987c658a61f432804c4662b736dbd5fc5939af1f (patch) | |
| tree | 96c03383038a6f2fdddd3cd1864e389232fb004b /drivers | |
| parent | sfc: Use filter index rather than ID for rps_flow_id table (diff) | |
| download | linux-dev-987c658a61f432804c4662b736dbd5fc5939af1f.tar.xz linux-dev-987c658a61f432804c4662b736dbd5fc5939af1f.zip | |
sfc: fix ARFS expiry check on EF10
Owing to a missing conditional, the result of rps_may_expire_flow() was
being ignored and filters were being removed even if we'd decided not to
expire them.
Fixes: f8d6203780b7 ("sfc: ARFS filter IDs")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/sfc/ef10.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index 63036d9bf3e6..d90a7b1f4088 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -4784,8 +4784,9 @@ expire: * will set rule->filter_id to EFX_ARFS_FILTER_ID_PENDING, meaning that * the rule is not removed by efx_rps_hash_del() below. */ - ret = efx_ef10_filter_remove_internal(efx, 1U << spec->priority, - filter_idx, true) == 0; + if (ret) + ret = efx_ef10_filter_remove_internal(efx, 1U << spec->priority, + filter_idx, true) == 0; /* While we can't safely dereference rule (we dropped the lock), we can * still test it for NULL. */ |