rndis_wlan: fix initialization order for workqueue&workers
PATCH 1/1 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.
This bug has existed since 2.6.25, reported at:
http://bugzilla.kernel.org/show_bug.cgi?id=12794
Signed-off-by Jussi Kivilinna <[email protected]>
---
drivers/net/wireless/rndis_wlan.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/wireless/rndis_wlan.c +10 -4
@@ -2558,6 +2558,11 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)mutex_init (&priv->command_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); +/* try bind rndis_host */ retval =generic_rndis_bind (usbdev, intf,FLAG_RNDIS_PHYM_WIRELESS );if (retval <0 )
@@ -2603,16 +2608,17 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)disassociate (usbdev,1 );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,round_jiffies_relative (STATS_UPDATE_JIFFIES )); -INIT_WORK (&priv->work, rndis_wext_worker);return 0 ; fail: +cancel_delayed_work_sync (&priv->stats_work); +cancel_work_sync (&priv->work); +flush_workqueue (priv->workqueue); +destroy_workqueue (priv->workqueue); +kfree (priv);return retval; }