Commit 2ffff144 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-dsa-use-more-appropriate-net_name_-constants-for-user-ports' 

Rasmus Villemoes says:

====================
net: dsa: use more appropriate NET_NAME_* constants for user ports

The intention of commit 685343fc ("net: add name_assign_type
netdev attribute") was clearly that drivers be switched over one by
one to select appropriate NET_NAME_* constants instead of
NET_NAME_UNKNOWN. This small series attempts to do that for DSA user
ports.

This is obviously and intentionally user-visible changes, so there's a
small chance that it could lead to a regression. To make it easy to
revert either of the "label in DT" and "fallback to eth%d" changes,
this is done as a refactoring which shouldn't introduce any functional
change (but by itself adds code which looks a little odd, with the two
identical assignments in the two branches), followed by changing the
constant used in each case in two different patches.
====================

Link: https://lore.kernel.org/r/20221116105205.1127843-1-linux@rasmusvillemoes.dk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f20a0a05 b8790661

net/dsa/dsa2.c

+0 −3
Original line number Diff line number Diff line
@@ -1365,9 +1365,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;

net/dsa/slave.c

+11 −2
Original line number Diff line number Diff line
@@ -2366,16 +2366,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_PREDICTABLE;

	} else {

		name = "eth%d";

		assign_type = NET_NAME_ENUM;

	}



	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;