X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5f6719e705d1eca5c2985c7ab61cad2631208fd5..a6ff6c1f36b886b61a08ac89996ee15340e6fc64:/package/mac80211/patches/022-atomic64_backport.patch?ds=sidebyside diff --git a/package/mac80211/patches/022-atomic64_backport.patch b/package/mac80211/patches/022-atomic64_backport.patch index 27e2edb71..17df9c9b5 100644 --- a/package/mac80211/patches/022-atomic64_backport.patch +++ b/package/mac80211/patches/022-atomic64_backport.patch @@ -11,9 +11,9 @@ +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 - #define list_entry_rcu(ptr, type, member) \ - container_of(rcu_dereference(ptr), type, member) +@@ -202,6 +202,20 @@ void compat_synchronize_threaded_irq(str + #define skb_walk_frags(skb, iter) \ + for (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next) +#ifndef CONFIG_64BIT + @@ -34,10 +34,12 @@ #endif /* LINUX_26_31_COMPAT_H */ --- /dev/null +++ b/compat/compat_atomic.c -@@ -0,0 +1,29 @@ +@@ -0,0 +1,33 @@ +#include +#include + ++#if !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64)) ++ +static DEFINE_SPINLOCK(lock); + +long long atomic64_read(const atomic64_t *v) @@ -64,11 +66,13 @@ +} +EXPORT_SYMBOL(atomic64_add_return); + ++#endif ++ --- a/include/linux/compat-3.1.h +++ b/include/linux/compat-3.1.h -@@ -24,6 +24,18 @@ - - #define genl_dump_check_consistent(...) do {} while(0) +@@ -36,6 +36,18 @@ + .prod_id = { NULL, NULL, (v3), NULL }, \ + .prod_id_hash = { 0, 0, (vh3), 0 }, } +/* + * In many versions, several architectures do not seem to include an @@ -78,7 +82,7 @@ + */ +#include + -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && !defined(ATOMIC64_INIT) && !defined(CONFIG_X86) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64)) +#include +#endif +