This is a fix to a regression introduced in r27572.

Redux: thanks, Daniel, for pointing out the ifndef CONFIG_GENERIC_ATOMIC64 was 
backwards in sense.

Index: package/mac80211/patches/022-atomic64_backport.patch
===================================================================
--- package/mac80211/patches/022-atomic64_backport.patch        (revision 27601)
+++ package/mac80211/patches/022-atomic64_backport.patch        (working copy)
@@ -5,17 +5,18 @@
        kstrtox.o
  
 +ifndef CONFIG_64BIT
-+ifndef CONFIG_GENERIC_ATOMIC64
++ifdef CONFIG_GENERIC_ATOMIC64
 +  compat-y += compat_atomic.o
 +endif
 +endif
 --- a/include/linux/compat-2.6.31.h
 +++ b/include/linux/compat-2.6.31.h
-@@ -199,6 +199,20 @@ void compat_synchronize_threaded_irq(str
+@@ -199,6 +199,22 @@ void compat_synchronize_threaded_irq(str
  #define list_entry_rcu(ptr, type, member) \
        container_of(rcu_dereference(ptr), type, member)
  
 +#ifndef CONFIG_64BIT
++#ifdef CONFIG_GENERIC_ATOMIC64
 +
 +typedef struct {
 +      long long counter;
@@ -27,6 +28,7 @@
 +#define atomic64_inc_return(v)          atomic64_add_return(1LL, (v))
 +
 +#endif
++#endif
 +
 +
  #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to