diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /drivers/net/wireless/mwifiex/main.c | |
parent | ccdbb6e96beca362db876d820ac1e560ff6d9579 (diff) | |
parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
download | blackbird-op-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.gz blackbird-op-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index c2b91f566e05..9d7c9d354d34 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -882,7 +882,9 @@ mwifiex_add_card(void *card, struct semaphore *sem, adapter->cmd_wait_q.status = 0; adapter->scan_wait_q_woken = false; - adapter->workqueue = create_workqueue("MWIFIEX_WORK_QUEUE"); + adapter->workqueue = + alloc_workqueue("MWIFIEX_WORK_QUEUE", + WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); if (!adapter->workqueue) goto err_kmalloc; |