projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6-block.git]
/
net
/
mac80211
/
main.c
diff --git
a/net/mac80211/main.c
b/net/mac80211/main.c
index 626c83c042d78b74df144c92bf83f0970214e46a..091088ac7890a9c7f873f623f7789cffb9e12def 100644
(file)
--- a/
net/mac80211/main.c
+++ b/
net/mac80211/main.c
@@
-920,7
+920,7
@@
int ieee80211_register_hw(struct ieee80211_hw *hw)
hw->queues = IEEE80211_MAX_QUEUES;
local->workqueue =
- alloc_ordered_workqueue(
wiphy_name(local->hw.wiphy), 0
);
+ alloc_ordered_workqueue(
"%s", 0, wiphy_name(local->hw.wiphy)
);
if (!local->workqueue) {
result = -ENOMEM;
goto fail_workqueue;