compat-wireless: update to 3.5-3-snpc.

This commit is contained in:
Arne Fitzenreiter
2012-08-13 13:39:34 -04:00
parent 337726bf3a
commit 21df33072c
4 changed files with 27 additions and 45 deletions

View File

@@ -1,37 +0,0 @@
diff -Naur compat-wireless-3.2.5-1.org/compat/compat_atomic.c compat-wireless-3.2.5-1/compat/compat_atomic.c
--- compat-wireless-3.2.5-1.org/compat/compat_atomic.c 2012-02-07 04:45:51.000000000 +0100
+++ compat-wireless-3.2.5-1/compat/compat_atomic.c 2012-02-18 15:39:42.000000000 +0100
@@ -3,6 +3,8 @@
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && (defined(CONFIG_UML) || defined(CONFIG_X86))) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64))
+#include <asm-generic/atomic64.h>
+
static DEFINE_SPINLOCK(lock);
long long atomic64_read(const atomic64_t *v)
diff -Naur compat-wireless-3.2.5-1.org/compat/Makefile compat-wireless-3.2.5-1/compat/Makefile
--- compat-wireless-3.2.5-1.org/compat/Makefile 2012-02-07 05:25:54.000000000 +0100
+++ compat-wireless-3.2.5-1/compat/Makefile 2012-02-18 13:35:18.000000000 +0100
@@ -38,3 +38,9 @@
cordic.o \
crc8.o
+
+ifndef CONFIG_64BIT
+ifndef CONFIG_GENERIC_ATOMIC64
+ compat-y += compat_atomic.o
+endif
+endif
diff -Naur compat-wireless-3.2.5-1.org/net/mac80211/key.h compat-wireless-3.2.5-1/net/mac80211/key.h
--- compat-wireless-3.2.5-1.org/net/mac80211/key.h 2012-02-07 05:25:53.000000000 +0100
+++ compat-wireless-3.2.5-1/net/mac80211/key.h 2012-02-18 15:40:44.000000000 +0100
@@ -32,6 +32,8 @@
#define NUM_RX_DATA_QUEUES 16
+#include <asm-generic/atomic64.h>
+
struct ieee80211_local;
struct ieee80211_sub_if_data;
struct sta_info;

View File

@@ -0,0 +1,16 @@
diff -Naur compat-wireless-3.5-1-snpc.org/config.mk compat-wireless-3.5/config.mk
--- compat-wireless-3.5-1-snpc.org/config.mk 2012-07-31 17:22:29.000000000 -0400
+++ compat-wireless-3.5/config.mk 2012-08-13 13:09:55.913234600 -0400
@@ -246,10 +246,12 @@
# mac80211 test driver
export CONFIG_MAC80211_HWSIM=m
+ifdef CONFIG_PCI
export CONFIG_ATH5K=m
# export CONFIG_ATH5K_DEBUG=y
# export CONFIG_ATH5K_TRACER=y
# export CONFIG_ATH5K_AHB=y
+endif #CONFIG_PCI
export CONFIG_ATH9K=m
export CONFIG_ATH9K_HW=m