diff options
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/cfg80211.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index be23a29e7de0..a66d18e380fc 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -3147,10 +3147,14 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, SET_NETDEV_DEV(dev, adapter->dev); - priv->dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC%s", + ret = dev_alloc_name(dev, name); + if (ret) + goto err_alloc_name; + + priv->dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC-%s", WQ_HIGHPRI | WQ_MEM_RECLAIM | - WQ_UNBOUND, 0, name); + WQ_UNBOUND, 0, dev->name); if (!priv->dfs_cac_workqueue) { mwifiex_dbg(adapter, ERROR, "cannot alloc DFS CAC queue\n"); ret = -ENOMEM; @@ -3159,9 +3163,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, INIT_DELAYED_WORK(&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue); - priv->dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW%s", + priv->dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW-%s", WQ_HIGHPRI | WQ_UNBOUND | - WQ_MEM_RECLAIM, 0, name); + WQ_MEM_RECLAIM, 0, dev->name); if (!priv->dfs_chan_sw_workqueue) { mwifiex_dbg(adapter, ERROR, "cannot alloc DFS channel sw queue\n"); ret = -ENOMEM; @@ -3198,6 +3202,7 @@ err_alloc_chsw: destroy_workqueue(priv->dfs_cac_workqueue); priv->dfs_cac_workqueue = NULL; err_alloc_cac: +err_alloc_name: free_netdev(dev); priv->netdev = NULL; err_sta_init: |