mac80211: merge an upstream fix for an aggregation related race condition

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 050-compat_firmware.patch

diff --git a/package/mac80211/patches/050-compat_firmware.patch b/package/mac80211/patches/050-compat_firmware.patch
index 0fcee76317bd18a1c83eca0845804c5e89268998..af7c4fec62e40dafa892cf62907114f0a7dd172a 100644 (file)
--- a/package/mac80211/patches/050-compat_firmware.patch
+++ b/package/mac80211/patches/050-compat_firmware.patch
@@ -17,7 +17,7 @@
  compat-$(CONFIG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o
 --- a/compat/compat_firmware_class.c
 +++ b/compat/compat_firmware_class.c
-@@ -729,19 +729,16 @@ request_firmware_nowait(
+@@ -741,19 +741,16 @@ request_firmware_nowait(
        return 0;
  }
  
@@ -41,7 +41,7 @@
  EXPORT_SYMBOL(request_firmware_nowait);
 --- a/compat/main.c
 +++ b/compat/main.c
-@@ -32,6 +32,14 @@ module_param(compat_version, charp, 0400
+@@ -32,6 +32,17 @@ module_param(compat_version, charp, 0400
  MODULE_PARM_DESC(compat_version,
                 "Version of the kernel compat backport work");
  
@@ -49,14 +49,17 @@
 +int __init firmware_class_init(void);
 +void __exit firmware_class_exit(void);
 +#else
-+static inline int firmware_class_init(void) {}
++static inline int firmware_class_init(void)
++{
++      return 0;
++}
 +static inline void firmware_class_exit(void) {}
 +#endif
 +
  static int __init compat_init(void)
  {
        /* pm-qos for kernels <= 2.6.24, this is a no-op on newer kernels */
-@@ -45,15 +53,15 @@ static int __init compat_init(void)
+@@ -46,7 +57,8 @@ static int __init compat_init(void)
               COMPAT_BASE_TREE " " COMPAT_BASE_TREE_VERSION
               "\n");
  
@@ -66,12 +69,13 @@
  }
  module_init(compat_init);
  
- static void __exit compat_exit(void)
- {
+@@ -55,7 +67,8 @@ static void __exit compat_exit(void)
        compat_pm_qos_power_deinit();
--
+       compat_system_workqueue_destroy();
+ 
 -        return;
 +      firmware_class_exit();
++      return;
  }
  module_exit(compat_exit);