| Message ID | 20221116105205.1127843-2-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0171a1d22bb99174671484f409f66f5b96c073b4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: dsa: use more appropriate NET_NAME_* constants for user ports | expand |
On Wed, Nov 16, 2022 at 11:52:02AM +0100, Rasmus Villemoes wrote: > The following two patches each have a (small) chance of causing > regressions for userspace and will in that case of course need to be > reverted. > > In order to prepare for that and make those two patches independent > and individually revertable, refactor the code which sets the names > for user ports by moving the "fall back to eth%d if no label is given > in device tree" to dsa_slave_create(). > > No functional change (at least none intended). > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 11/16/2022 2:52 AM, Rasmus Villemoes wrote: > The following two patches each have a (small) chance of causing > regressions for userspace and will in that case of course need to be > reverted. > > In order to prepare for that and make those two patches independent > and individually revertable, refactor the code which sets the names > for user ports by moving the "fall back to eth%d if no label is given > in device tree" to dsa_slave_create(). > > No functional change (at least none intended). > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Florian Fainelli <f.faineli@gmail.com>
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index e504a18fc125..522fc1b6e8c6 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -1364,9 +1364,6 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index) static int dsa_port_parse_user(struct dsa_port *dp, const char *name) { - if (!name) - name = "eth%d"; - dp->type = DSA_PORT_TYPE_USER; dp->name = name; diff --git a/net/dsa/slave.c b/net/dsa/slave.c index a9fde48cffd4..d19e9a536b8f 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2374,16 +2374,25 @@ int dsa_slave_create(struct dsa_port *port) { struct net_device *master = dsa_port_to_master(port); struct dsa_switch *ds = port->ds; - const char *name = port->name; struct net_device *slave_dev; struct dsa_slave_priv *p; + const char *name; + int assign_type; int ret; if (!ds->num_tx_queues) ds->num_tx_queues = 1; + if (port->name) { + name = port->name; + assign_type = NET_NAME_UNKNOWN; + } else { + name = "eth%d"; + assign_type = NET_NAME_UNKNOWN; + } + slave_dev = alloc_netdev_mqs(sizeof(struct dsa_slave_priv), name, - NET_NAME_UNKNOWN, ether_setup, + assign_type, ether_setup, ds->num_tx_queues, 1); if (slave_dev == NULL) return -ENOMEM;
The following two patches each have a (small) chance of causing regressions for userspace and will in that case of course need to be reverted. In order to prepare for that and make those two patches independent and individually revertable, refactor the code which sets the names for user ports by moving the "fall back to eth%d if no label is given in device tree" to dsa_slave_create(). No functional change (at least none intended). Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- net/dsa/dsa2.c | 3 --- net/dsa/slave.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-)