mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 09:46:51 +07:00
rndis_wlan: fix initialization order for workqueue&workers
rndis_wext_link_change() might be called from rndis_command() at initialization stage and priv->workqueue/priv->work have not been initialized yet. This causes invalid opcode at rndis_wext_bind on some brands of bcm4320. Fix by initializing workqueue/workers in rndis_wext_bind() before rndis_command is used. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
caa6dfadeb
commit
8d4d99ae89
@ -2384,6 +2384,12 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
|
|||||||
mutex_init(&priv->command_lock);
|
mutex_init(&priv->command_lock);
|
||||||
spin_lock_init(&priv->stats_lock);
|
spin_lock_init(&priv->stats_lock);
|
||||||
|
|
||||||
|
/* because rndis_command() sleeps we need to use workqueue */
|
||||||
|
priv->workqueue = create_singlethread_workqueue("rndis_wlan");
|
||||||
|
INIT_WORK(&priv->work, rndis_wext_worker);
|
||||||
|
INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats);
|
||||||
|
INIT_DELAYED_WORK(&priv->scan_work, rndis_get_scan_results);
|
||||||
|
|
||||||
/* try bind rndis_host */
|
/* try bind rndis_host */
|
||||||
retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS);
|
retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS);
|
||||||
if (retval < 0)
|
if (retval < 0)
|
||||||
@ -2454,17 +2460,18 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
|
|||||||
disassociate(usbdev, 1);
|
disassociate(usbdev, 1);
|
||||||
netif_carrier_off(usbdev->net);
|
netif_carrier_off(usbdev->net);
|
||||||
|
|
||||||
/* because rndis_command() sleeps we need to use workqueue */
|
|
||||||
priv->workqueue = create_singlethread_workqueue("rndis_wlan");
|
|
||||||
INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats);
|
|
||||||
queue_delayed_work(priv->workqueue, &priv->stats_work,
|
queue_delayed_work(priv->workqueue, &priv->stats_work,
|
||||||
round_jiffies_relative(STATS_UPDATE_JIFFIES));
|
round_jiffies_relative(STATS_UPDATE_JIFFIES));
|
||||||
INIT_DELAYED_WORK(&priv->scan_work, rndis_get_scan_results);
|
|
||||||
INIT_WORK(&priv->work, rndis_wext_worker);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
cancel_delayed_work_sync(&priv->stats_work);
|
||||||
|
cancel_delayed_work_sync(&priv->scan_work);
|
||||||
|
cancel_work_sync(&priv->work);
|
||||||
|
flush_workqueue(priv->workqueue);
|
||||||
|
destroy_workqueue(priv->workqueue);
|
||||||
|
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user