From: Vladimir Oltean <olteanv@gmail•com>
To: netdev@vger•kernel.org
Cc: "Jakub Kicinski" <kuba@kernel•org>,
"Florian Fainelli" <f.fainelli@gmail•com>,
"Vivien Didelot" <vivien.didelot@gmail•com>,
"Andrew Lunn" <andrew@lunn•ch>,
"Vladimir Oltean" <olteanv@gmail•com>,
"Tobias Waldekranz" <tobias@waldekranz•com>,
"Marek Behún" <kabel@kernel•org>,
"Ansuel Smith" <ansuelsmth@gmail•com>,
"DENG Qingfang" <dqfext@gmail•com>,
"Alvin Šipraga" <alsi@bang-olufsen•dk>,
"Claudiu Manoil" <claudiu.manoil@nxp•com>,
"Alexandre Belloni" <alexandre.belloni@bootlin•com>,
UNGLinuxDriver@microchip•com,
"Colin Foster" <colin.foster@in-advantage•com>,
"Linus Walleij" <linus.walleij@linaro•org>,
"Luiz Angelo Daros de Luca" <luizluca@gmail•com>,
"Roopa Prabhu" <roopa@nvidia•com>,
"Nikolay Aleksandrov" <razor@blackwall•org>,
"Frank Wunderlich" <frank-w@public-files•de>,
"Vladimir Oltean" <vladimir.oltean@nxp•com>
Subject: [RFC PATCH net-next 03/12] net: dsa: don't stop at NOTIFY_OK when calling ds->ops->port_prechangeupper
Date: Mon, 23 May 2022 13:42:47 +0300 [thread overview]
Message-ID: <20220523104256.3556016-4-olteanv@gmail.com> (raw)
In-Reply-To: <20220523104256.3556016-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp•com>
dsa_slave_prechangeupper_sanity_check() is supposed to enforce some
adjacency restrictions, and calls ds->ops->port_prechangeupper if the
driver implements it.
We convert the error code from the port_prechangeupper() call to a
notifier code, and 0 is converted to NOTIFY_OK, but the caller of
dsa_slave_prechangeupper_sanity_check() stops at any notifier code
different from NOTIFY_DONE.
Avoid this by converting back the notifier code to an error code, so
that both NOTIFY_OK and NOTIFY_DONE will be seen as 0. This allows more
parallel sanity check functions to be added.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp•com>
---
net/dsa/slave.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8d62c634c331..d8768e8f7862 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2685,7 +2685,7 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb,
int err;
err = dsa_slave_prechangeupper_sanity_check(dev, info);
- if (err != NOTIFY_DONE)
+ if (notifier_to_errno(err))
return err;
err = dsa_slave_prechangeupper(dev, ptr);
--
2.25.1
next prev parent reply other threads:[~2022-05-23 10:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 10:42 [RFC PATCH net-next 00/12] DSA changes for multiple CPU ports (part 3) Vladimir Oltean
2022-05-23 10:42 ` [RFC PATCH net-next 01/12] net: introduce iterators over synced hw addresses Vladimir Oltean
2022-05-23 17:54 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 02/12] net: dsa: walk through all changeupper notifier functions Vladimir Oltean
2022-05-23 18:11 ` Florian Fainelli
2022-05-23 10:42 ` Vladimir Oltean [this message]
2022-05-23 17:56 ` [RFC PATCH net-next 03/12] net: dsa: don't stop at NOTIFY_OK when calling ds->ops->port_prechangeupper Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 04/12] net: bridge: move DSA master bridging restriction to DSA Vladimir Oltean
2022-05-23 17:57 ` Florian Fainelli
2022-05-23 23:02 ` Nikolay Aleksandrov
2022-05-23 10:42 ` [RFC PATCH net-next 05/12] net: dsa: existing DSA masters cannot join upper interfaces Vladimir Oltean
2022-05-23 17:58 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 06/12] net: dsa: only bring down user ports assigned to a given DSA master Vladimir Oltean
2022-05-23 17:59 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 07/12] net: dsa: all DSA masters must be down when changing the tagging protocol Vladimir Oltean
2022-05-23 18:00 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 08/12] net: dsa: use dsa_tree_for_each_cpu_port in dsa_tree_{setup,teardown}_master Vladimir Oltean
2022-05-23 18:01 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 09/12] net: dsa: introduce dsa_port_get_master() Vladimir Oltean
2022-05-23 18:08 ` Florian Fainelli
2022-05-23 10:42 ` [RFC PATCH net-next 10/12] net: dsa: allow the DSA master to be seen and changed through rtnetlink Vladimir Oltean
2022-05-23 18:41 ` Florian Fainelli
2022-05-23 23:08 ` Vladimir Oltean
2022-05-23 10:42 ` [RFC PATCH net-next 11/12] net: dsa: allow masters to join a LAG Vladimir Oltean
2022-05-23 10:42 ` [RFC PATCH net-next 12/12] net: dsa: felix: add support for changing DSA master Vladimir Oltean
2022-05-23 21:53 ` [RFC PATCH net-next 00/12] DSA changes for multiple CPU ports (part 3) Florian Fainelli
2022-05-23 22:51 ` Vladimir Oltean
2022-05-24 12:02 ` Ansuel Smith
2022-05-24 12:29 ` Vladimir Oltean
2022-05-24 12:38 ` Ansuel Smith
2022-05-24 13:24 ` Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220523104256.3556016-4-olteanv@gmail.com \
--to=olteanv@gmail$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=alsi@bang-olufsen$(echo .)dk \
--cc=andrew@lunn$(echo .)ch \
--cc=ansuelsmth@gmail$(echo .)com \
--cc=claudiu.manoil@nxp$(echo .)com \
--cc=colin.foster@in-advantage$(echo .)com \
--cc=dqfext@gmail$(echo .)com \
--cc=f.fainelli@gmail$(echo .)com \
--cc=frank-w@public-files$(echo .)de \
--cc=kabel@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=luizluca@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=razor@blackwall$(echo .)org \
--cc=roopa@nvidia$(echo .)com \
--cc=tobias@waldekranz$(echo .)com \
--cc=vivien.didelot@gmail$(echo .)com \
--cc=vladimir.oltean@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox