summaryrefslogtreecommitdiff
path: root/patches/36-workqueue.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-02-01 22:13:47 +0100
committerLuis R. Rodriguez <lrodriguez@atheros.com>2011-02-07 16:43:01 -0800
commit86702b3508259a514e1b57de9f0404c1ea5c686b (patch)
treedae64020a60fc58116687240814907fe43718d8f /patches/36-workqueue.patch
parent63bb2c58a0686a4863783cdcaa01dad5b58aac6f (diff)
compat-wireless: backport of alloc_ordered_workqueue into compat.git
The backport of alloc_ordered_workqueue is now in compat.git. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/36-workqueue.patch')
-rw-r--r--patches/36-workqueue.patch15
1 files changed, 2 insertions, 13 deletions
diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
index 06e580df..dfa6d8b4 100644
--- a/patches/36-workqueue.patch
+++ b/patches/36-workqueue.patch
@@ -1,20 +1,9 @@
Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
+The rest is backported in include/linux/compat-2.6.37.h
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -787,7 +787,11 @@ int ieee80211_register_hw(struct ieee802
- hw->queues = IEEE80211_MAX_QUEUES;
-
- local->workqueue =
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
- alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0);
-+#else
-+ create_singlethread_workqueue(wiphy_name(local->hw.wiphy));
-+#endif
- if (!local->workqueue) {
- result = -ENOMEM;
- goto fail_workqueue;
-@@ -1002,6 +1006,10 @@ static void __exit ieee80211_exit(void)
+@@ -1002,6 +1002,10 @@ static void __exit ieee80211_exit(void)
rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();