From 55ac9b25ba2fe5bcb8d641ecf32cab7279569280 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 17 Nov 2021 14:44:35 +0300 Subject: [PATCH] net/sfc: refine order of checks on MAE action set attach The number of counters being non-zero can be detected before the action set registry traversal, so move the check outside. Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_mae.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 08e28b13c9..73bedf5088 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -763,13 +763,15 @@ sfc_mae_action_set_attach(struct sfc_adapter *sa, SFC_ASSERT(sfc_adapter_is_locked(sa)); + /* + * Shared counters are not supported, hence, action + * sets with counters are not attachable. + */ + if (n_count != 0) + return NULL; + TAILQ_FOREACH(action_set, &mae->action_sets, entries) { - /* - * Shared counters are not supported, hence action sets with - * COUNT are not attachable. - */ if (action_set->encap_header == encap_header && - n_count == 0 && efx_mae_action_set_specs_equal(action_set->spec, spec)) { sfc_dbg(sa, "attaching to action_set=%p", action_set); ++(action_set->refcnt); -- 2.20.1