Skip to content

Commit 0071f56

Browse files
lunndavem330
authored andcommitted
dsa: Register netdev before phy
When the phy is connected, an info message is printed. If the netdev it is attached to has not been registered yet, the name 'uninitialised' in the output. By registering the netdev first, then connecting they phy, we can avoid this. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5cf11be commit 0071f56

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

net/dsa/slave.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,13 +1189,6 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
11891189
p->old_link = -1;
11901190
p->old_duplex = -1;
11911191

1192-
ret = dsa_slave_phy_setup(p, slave_dev);
1193-
if (ret) {
1194-
netdev_err(master, "error %d setting up slave phy\n", ret);
1195-
free_netdev(slave_dev);
1196-
return ret;
1197-
}
1198-
11991192
ds->ports[port] = slave_dev;
12001193
ret = register_netdev(slave_dev);
12011194
if (ret) {
@@ -1209,6 +1202,13 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
12091202

12101203
netif_carrier_off(slave_dev);
12111204

1205+
ret = dsa_slave_phy_setup(p, slave_dev);
1206+
if (ret) {
1207+
netdev_err(master, "error %d setting up slave phy\n", ret);
1208+
free_netdev(slave_dev);
1209+
return ret;
1210+
}
1211+
12121212
return 0;
12131213
}
12141214

0 commit comments

Comments
 (0)