From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Ansuel Smith <ansuelsmth@gmail.com>,
Tobias Waldekranz <tobias@waldekranz.com>,
DENG Qingfang <dqfext@gmail.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
UNGLinuxDriver@microchip.com, Jiri Pirko <jiri@resnulli.us>,
Ivan Vecera <ivecera@redhat.com>
Subject: [PATCH v2 net-next 09/12] net: dsa: move dsa_foreign_dev_check above dsa_slave_switchdev_event_work
Date: Thu, 10 Feb 2022 14:51:58 +0200 [thread overview]
Message-ID: <20220210125201.2859463-10-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20220210125201.2859463-1-vladimir.oltean@nxp.com>
In preparation of LAG FDB support, we'll need to call
switchdev_lower_dev_find in order to get a handle of a DSA user port
from a LAG interface. That function takes dsa_foreign_dev_check() as one
of its arguments. So to avoid forward declarations,
dsa_foreign_dev_check() needs to be moved above it.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
net/dsa/slave.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 34bb20647bed..273ae558ccd9 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2086,6 +2086,22 @@ bool dsa_slave_dev_check(const struct net_device *dev)
}
EXPORT_SYMBOL_GPL(dsa_slave_dev_check);
+static bool dsa_foreign_dev_check(const struct net_device *dev,
+ const struct net_device *foreign_dev)
+{
+ const struct dsa_port *dp = dsa_slave_to_port(dev);
+ struct dsa_switch_tree *dst = dp->ds->dst;
+
+ if (netif_is_bridge_master(foreign_dev))
+ return !dsa_tree_offloads_bridge_dev(dst, foreign_dev);
+
+ if (netif_is_bridge_port(foreign_dev))
+ return !dsa_tree_offloads_bridge_port(dst, foreign_dev);
+
+ /* Everything else is foreign */
+ return true;
+}
+
static int dsa_slave_changeupper(struct net_device *dev,
struct netdev_notifier_changeupper_info *info)
{
@@ -2469,22 +2485,6 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)
kfree(switchdev_work);
}
-static bool dsa_foreign_dev_check(const struct net_device *dev,
- const struct net_device *foreign_dev)
-{
- const struct dsa_port *dp = dsa_slave_to_port(dev);
- struct dsa_switch_tree *dst = dp->ds->dst;
-
- if (netif_is_bridge_master(foreign_dev))
- return !dsa_tree_offloads_bridge_dev(dst, foreign_dev);
-
- if (netif_is_bridge_port(foreign_dev))
- return !dsa_tree_offloads_bridge_port(dst, foreign_dev);
-
- /* Everything else is foreign */
- return true;
-}
-
static int dsa_slave_fdb_event(struct net_device *dev,
struct net_device *orig_dev,
unsigned long event, const void *ctx,
--
2.25.1
next prev parent reply other threads:[~2022-02-10 12:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 12:51 [PATCH v2 net-next 00/12] FDB entries on DSA LAG interfaces Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 01/12] net: dsa: rename references to "lag" as "lag_dev" Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 02/12] net: dsa: mv88e6xxx: " Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 03/12] net: dsa: qca8k: " Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 04/12] net: dsa: make LAG IDs one-based Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 05/12] net: dsa: mv88e6xxx: use dsa_switch_for_each_port in mv88e6xxx_lag_sync_masks Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 06/12] net: dsa: create a dsa_lag structure Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 07/12] net: switchdev: export switchdev_lower_dev_find Vladimir Oltean
2022-02-10 12:51 ` [PATCH v2 net-next 08/12] net: dsa: remove "ds" and "port" from struct dsa_switchdev_event_work Vladimir Oltean
2022-02-10 12:51 ` Vladimir Oltean [this message]
2022-02-10 12:51 ` [PATCH v2 net-next 10/12] net: dsa: refactor FDB event work for user ports to separate function Vladimir Oltean
2022-02-10 12:52 ` [PATCH v2 net-next 11/12] net: dsa: support FDB events on offloaded LAG interfaces Vladimir Oltean
2022-02-11 23:03 ` Jakub Kicinski
2022-02-11 23:14 ` Vladimir Oltean
2022-02-10 12:52 ` [PATCH v2 net-next 12/12] net: dsa: felix: support FDB entries " 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=20220210125201.2859463-10-vladimir.oltean@nxp.com \
--to=vladimir.oltean@nxp.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=dqfext@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=ivecera@redhat.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tobias@waldekranz.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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