diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-01-09 02:01:51 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-11 16:00:57 -0800 |
| commit | 77b61365ecefb2404326c924e215f1ed5a680285 (patch) | |
| tree | 23f859153572a3ca26b9375aa0e4a9bc6b7ce0c5 /net/dsa/switch.c | |
| parent | bae33f2b5afea932176c1b9096851c81dc0983de (diff) | |
net: dsa: remove the transactional logic from ageing time notifiers
Remove the shim introduced in DSA for offloading the bridge ageing time
from switchdev, by first checking whether the ageing time is within the
range limits requested by the driver.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/dsa/switch.c')
| -rw-r--r-- | net/dsa/switch.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/dsa/switch.c b/net/dsa/switch.c index 17979956d756..c6b3ac93bcc7 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -33,15 +33,12 @@ static int dsa_switch_ageing_time(struct dsa_switch *ds, struct dsa_notifier_ageing_time_info *info) { unsigned int ageing_time = info->ageing_time; - struct switchdev_trans *trans = info->trans; - - if (switchdev_trans_ph_prepare(trans)) { - if (ds->ageing_time_min && ageing_time < ds->ageing_time_min) - return -ERANGE; - if (ds->ageing_time_max && ageing_time > ds->ageing_time_max) - return -ERANGE; - return 0; - } + + if (ds->ageing_time_min && ageing_time < ds->ageing_time_min) + return -ERANGE; + + if (ds->ageing_time_max && ageing_time > ds->ageing_time_max) + return -ERANGE; /* Program the fastest ageing time in case of multiple bridges */ ageing_time = dsa_switch_fastest_ageing_time(ds, ageing_time); |