提交 987c658a 编写于 作者: E Edward Cree 提交者: David S. Miller

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: f8d62037 ("sfc: ARFS filter IDs")
Signed-off-by: NEdward Cree <ecree@solarflare.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ded8b9c7
...@@ -4784,6 +4784,7 @@ static bool efx_ef10_filter_rfs_expire_one(struct efx_nic *efx, u32 flow_id, ...@@ -4784,6 +4784,7 @@ static bool efx_ef10_filter_rfs_expire_one(struct efx_nic *efx, u32 flow_id,
* will set rule->filter_id to EFX_ARFS_FILTER_ID_PENDING, meaning that * will set rule->filter_id to EFX_ARFS_FILTER_ID_PENDING, meaning that
* the rule is not removed by efx_rps_hash_del() below. * the rule is not removed by efx_rps_hash_del() below.
*/ */
if (ret)
ret = efx_ef10_filter_remove_internal(efx, 1U << spec->priority, ret = efx_ef10_filter_remove_internal(efx, 1U << spec->priority,
filter_idx, true) == 0; filter_idx, true) == 0;
/* While we can't safely dereference rule (we dropped the lock), we can /* While we can't safely dereference rule (we dropped the lock), we can
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册