2024-05-14 15:51:46

by Alexis Lothoré

Subject: [PATCH v2 1/6] wifi: wilc1000: set net device registration as last step during interface creation

net device registration is currently done in wilc_netdev_ifc_init but
other initialization operations are still done after this registration.
Since net device is assumed to be usable right after registration, it
should be the very last step of initialization.

Move netdev registration at the very end of wilc_netdev_ifc_init to let
this function completely initialize netdevice before registering it.

Signed-off-by: Alexis Lothoré <[email protected]>
---
drivers/net/wireless/microchip/wilc1000/netdev.c | 31 ++++++++++++------------
1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index 73f56f7b002b..acc9b9a64552 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -965,16 +965,6 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
vif->priv.wdev.iftype = type;
vif->priv.dev = ndev;

- if (rtnl_locked)
- ret = cfg80211_register_netdevice(ndev);
- else
- ret = register_netdev(ndev);
-
- if (ret) {
- ret = -EFAULT;
- goto error;
- }
-
ndev->needs_free_netdev = true;
vif->iftype = vif_type;
vif->idx = wilc_get_available_idx(wl);
@@ -985,13 +975,24 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
mutex_unlock(&wl->vif_mutex);
synchronize_rcu();

- return vif;
-
-error:
if (rtnl_locked)
- cfg80211_unregister_netdevice(ndev);
+ ret = cfg80211_register_netdevice(ndev);
else
- unregister_netdev(ndev);
+ ret = register_netdev(ndev);
+
+ if (ret) {
+ ret = -EFAULT;
+ goto error_remove_vif;
+ }
+
+ return vif;
+
+error_remove_vif:
+ mutex_lock(&wl->vif_mutex);
+ list_del_rcu(&vif->list);
+ wl->vif_num -= 1;
+ mutex_unlock(&wl->vif_mutex);
+ synchronize_rcu();
free_netdev(ndev);
return ERR_PTR(ret);
}

--
2.44.0

2024-05-17 08:03:20

by Kalle Valo

Subject: Re: [PATCH v2 1/6] wifi: wilc1000: set net device registration as last step during interface creation

Alexis Lothoré <[email protected]> wrote:

> net device registration is currently done in wilc_netdev_ifc_init but
> other initialization operations are still done after this registration.
> Since net device is assumed to be usable right after registration, it
> should be the very last step of initialization.
>
> Move netdev registration at the very end of wilc_netdev_ifc_init to let
> this function completely initialize netdevice before registering it.
>
> Signed-off-by: Alexis Lothoré <[email protected]>

6 patches applied to wireless-next.git, thanks.

6fe46d5c0a84 wifi: wilc1000: set net device registration as last step during interface creation
ec99908906e9 wifi: wilc1000: register net device only after bus being fully initialized
5f1191ed386c wifi: wilc1000: set wilc_set_mac_address parameter as const
59cf9277c1fe wifi: wilc1000: add function to read mac address from eFuse
a5d6b1d453a1 wifi: wilc1000: make sdio deinit function really deinit the sdio card
83d9b54ee5d4 wifi: wilc1000: read MAC address from fuse at probe

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches