public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-14 19:53:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq"

Browse source 
This follows normal Linux convention and is more useful since the new
name will make it apparent which network device the work-queue is for
(e.g., the name will be "wlan0-wq" for network device "wlan0").

hif_workqueue allocation has to move from
cfg80211.c:wilc_cfg80211_init() to netdev.c:wilc_netdev_ifc_init()
because the network device name is not known until after the netdev is
registered.  The move also makes sense because netdev.c is already
responsible for destroying the work queue when it is no longer needed.

Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20211209044411.3482259-5-davidm@egauge.net
This commit is contained in:
David Mosberger-Tang 2021-12-09 04:44:30 +00:00 • committed by Kalle Valo
parent 3cc23932ba
commit 09ed8bfc52
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/microchip/wilc1000/cfg80211.c
View file

@ -1737,23 +1737,15 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
INIT_LIST_HEAD(&wl->rxq_head.list);
INIT_LIST_HEAD(&wl->vif_list);
wl->hif_workqueue = create_singlethread_workqueue("WILC_wq");
if (!wl->hif_workqueue) {
ret = -ENOMEM;
goto free_cfg;
}
vif = wilc_netdev_ifc_init(wl, "wlan%d", WILC_STATION_MODE,
NL80211_IFTYPE_STATION, false);
if (IS_ERR(vif)) {
ret = PTR_ERR(vif);
goto free_hq;
goto free_cfg;
}
return 0;
free_hq:
destroy_workqueue(wl->hif_workqueue);
free_cfg:
wilc_wlan_cfg_deinit(wl);

15
drivers/net/wireless/microchip/wilc1000/netdev.c
View file

@ -962,8 +962,15 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
ret = register_netdev(ndev);
if (ret) {
free_netdev(ndev);
return ERR_PTR(-EFAULT);
ret = -EFAULT;
goto error;
}
wl->hif_workqueue = alloc_ordered_workqueue("%s-wq", WQ_MEM_RECLAIM,
ndev->name);
if (!wl->hif_workqueue) {
ret = -ENOMEM;
goto error;
}
ndev->needs_free_netdev = true;
@ -977,6 +984,10 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
synchronize_srcu(&wl->srcu);
return vif;
error:
free_netdev(ndev);
return ERR_PTR(ret);
}
MODULE_LICENSE("GPL");