| Message ID | 20221116105205.1127843-4-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b8790661d90d7bbfb745df40262d13a0e8ae6400 |
| 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:04AM +0100, Rasmus Villemoes wrote: > When a user port does not have a label in device tree, and we thus > fall back to the eth%d scheme, the proper constant to use is > NET_NAME_ENUM. See also commit e9f656b7a214 ("net: ethernet: set > default assignment identifier to NET_NAME_ENUM"), which in turn quoted > commit 685343fc3ba6 ("net: add name_assign_type netdev attribute"): > > ... when the kernel has given the interface a name using global > device enumeration based on order of discovery (ethX, wlanY, etc) > ... are labelled NET_NAME_ENUM. > > 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: > When a user port does not have a label in device tree, and we thus > fall back to the eth%d scheme, the proper constant to use is > NET_NAME_ENUM. See also commit e9f656b7a214 ("net: ethernet: set > default assignment identifier to NET_NAME_ENUM"), which in turn quoted > commit 685343fc3ba6 ("net: add name_assign_type netdev attribute"): > > ... when the kernel has given the interface a name using global > device enumeration based on order of discovery (ethX, wlanY, etc) > ... are labelled NET_NAME_ENUM. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Florian Fainelli <f.faineli@gmail.com>
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index dfefcc4a9ccf..821ab79bb60a 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2388,7 +2388,7 @@ int dsa_slave_create(struct dsa_port *port) assign_type = NET_NAME_PREDICTABLE; } else { name = "eth%d"; - assign_type = NET_NAME_UNKNOWN; + assign_type = NET_NAME_ENUM; } slave_dev = alloc_netdev_mqs(sizeof(struct dsa_slave_priv), name,
When a user port does not have a label in device tree, and we thus fall back to the eth%d scheme, the proper constant to use is NET_NAME_ENUM. See also commit e9f656b7a214 ("net: ethernet: set default assignment identifier to NET_NAME_ENUM"), which in turn quoted commit 685343fc3ba6 ("net: add name_assign_type netdev attribute"): ... when the kernel has given the interface a name using global device enumeration based on order of discovery (ethX, wlanY, etc) ... are labelled NET_NAME_ENUM. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- net/dsa/slave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)