This just reverts the workqueue patch commited in
99b88a0ecbdbc6df03527292571b2b442965814a
mac80211: cancel restart_work explicitly instead of depending on flush_scheduled_work()
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
patches/36-workqueue.patch | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 patches/36-workqueue.patch
diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
new file mode 100644
index 0000000..9bb2705
--- /dev/null
+++ b/patches/36-workqueue.patch
@@ -0,0 +1,27 @@
+Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
+
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -754,7 +754,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;
+@@ -968,6 +972,10 @@ static void __exit ieee80211_exit(void)
+ rc80211_minstrel_ht_exit();
+ rc80211_minstrel_exit();
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
++ flush_scheduled_work();
++#endif
++
+ if (mesh_allocated)
+ ieee80211s_stop();
+
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
