parent
40a175150e
commit
0244e57bb9
@ -0,0 +1,35 @@ |
||||
--- a/ath_hal/ah_os.h
|
||||
+++ b/ath_hal/ah_os.h
|
||||
@@ -194,10 +194,6 @@
|
||||
*/
|
||||
#if (AH_BYTE_ORDER == AH_BIG_ENDIAN)
|
||||
#define is_reg_le(__reg) ((0x4000 <= (__reg) && (__reg) < 0x5000))
|
||||
-#else
|
||||
-#define is_reg_le(__reg) 1
|
||||
-#endif
|
||||
-
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
|
||||
#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
||||
is_reg_le(_reg) ? \
|
||||
@@ -219,6 +215,21 @@
|
||||
readl((_ah)->ah_sh + (_reg)) : \
|
||||
cpu_to_le32(readl((_ah)->ah_sh + (_reg))))
|
||||
#endif /* KERNEL_VERSION(2,6,12) */
|
||||
+#else /* AH_BYTE_ORDER != AH_BIG_ENDIAN */
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
|
||||
+#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
||||
+ iowrite32((_val), (_ah)->ah_sh + (_reg)); \
|
||||
+ } while (0)
|
||||
+#define _OS_REG_READ(_ah, _reg) \
|
||||
+ ioread32((_ah)->ah_sh + (_reg))
|
||||
+#else
|
||||
+#define _OS_REG_WRITE(_ah, _reg, _val) do { \
|
||||
+ writel((_val), (_ah)->ah_sh + (_reg)); \
|
||||
+ } while (0)
|
||||
+#define _OS_REG_READ(_ah, _reg) \
|
||||
+ readl((_ah)->ah_sh + (_reg))
|
||||
+#endif /* KERNEL_VERSION(2,6,12) */
|
||||
+#endif /* AH_BYTE_ORDER != AH_BIG_ENDIAN */
|
||||
|
||||
/*
|
||||
* The functions in this section are not intended to be invoked by MadWifi
|
@ -0,0 +1,11 @@ |
||||
--- a/net80211/ieee80211_linux.h
|
||||
+++ b/net80211/ieee80211_linux.h
|
||||
@@ -312,6 +312,8 @@
|
||||
/* __skb_append got a third parameter in 2.6.14 */
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
||||
#define __skb_append(a,b,c) __skb_append(a, b)
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
|
||||
+#define __skb_append(a,b,c) __skb_queue_after(c, a, b)
|
||||
#endif
|
||||
|
||||
/*
|
@ -0,0 +1,176 @@ |
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -40,10 +40,7 @@
|
||||
# Makefile for the HAL-based Atheros driver.
|
||||
#
|
||||
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)
|
||||
|
||||
ifneq (svnversion.h,$(MAKECMDGOALS))
|
||||
--- a/ath/Makefile
|
||||
+++ b/ath/Makefile
|
||||
@@ -40,10 +40,7 @@
|
||||
# Makefile for the Atheros WLAN driver.
|
||||
#
|
||||
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/..
|
||||
|
||||
ifeq ($(strip $(BUS)),AHB)
|
||||
--- a/ath_hal/Makefile
|
||||
+++ b/ath_hal/Makefile
|
||||
@@ -40,10 +40,7 @@
|
||||
# Makefile for the Atheros WLAN driver.
|
||||
#
|
||||
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/..
|
||||
|
||||
include $(TOP)/Makefile.inc
|
||||
--- a/ath_rate/Makefile
|
||||
+++ b/ath_rate/Makefile
|
||||
@@ -1,7 +1,4 @@
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/..
|
||||
|
||||
obj-y := amrr/ onoe/ sample/ minstrel/
|
||||
--- a/ath_rate/amrr/Makefile
|
||||
+++ b/ath_rate/amrr/Makefile
|
||||
@@ -40,10 +40,7 @@
|
||||
#
|
||||
# Makefile for the Atheros Rate Control Support.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_rate_amrr.o
|
||||
--- a/ath_rate/minstrel/Makefile
|
||||
+++ b/ath_rate/minstrel/Makefile
|
||||
@@ -38,10 +38,7 @@
|
||||
#
|
||||
# Makefile for the Atheros Rate Control Support.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_rate_minstrel.o
|
||||
--- a/ath_rate/onoe/Makefile
|
||||
+++ b/ath_rate/onoe/Makefile
|
||||
@@ -40,10 +40,7 @@
|
||||
#
|
||||
# Makefile for the Atheros Rate Control Support.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_rate_onoe.o
|
||||
--- a/ath_rate/sample/Makefile
|
||||
+++ b/ath_rate/sample/Makefile
|
||||
@@ -38,10 +38,7 @@
|
||||
#
|
||||
# Makefile for the Atheros Rate Control Support.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_rate_sample.o
|
||||
--- a/net80211/Makefile
|
||||
+++ b/net80211/Makefile
|
||||
@@ -39,10 +39,7 @@
|
||||
#
|
||||
# Makefile for the 802.11 WLAN modules.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/..
|
||||
#
|
||||
# There is one authenticator mechanism: an in-kernel implementation
|
||||
--- a/regression/Makefile
|
||||
+++ b/regression/Makefile
|
||||
@@ -1,7 +1,4 @@
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/..
|
||||
|
||||
obj-y := ccmp/ tkip/ wep/
|
||||
--- a/regression/ccmp/Makefile
|
||||
+++ b/regression/ccmp/Makefile
|
||||
@@ -1,10 +1,7 @@
|
||||
#
|
||||
# Makefile for the CCMP regression test.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_test_ccmp.o
|
||||
--- a/regression/tkip/Makefile
|
||||
+++ b/regression/tkip/Makefile
|
||||
@@ -1,10 +1,7 @@
|
||||
#
|
||||
# Makefile for the TKIP regression test.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_test_tkip.o
|
||||
--- a/regression/wep/Makefile
|
||||
+++ b/regression/wep/Makefile
|
||||
@@ -1,10 +1,7 @@
|
||||
#
|
||||
# Makefile for the WEP regression test.
|
||||
#
|
||||
-ifeq ($(obj),)
|
||||
-obj= .
|
||||
-endif
|
||||
-
|
||||
+obj := $(firstword $(obj) $(SUBDIRS) .)
|
||||
TOP = $(obj)/../..
|
||||
|
||||
obj-m += ath_test_wep.o
|
@ -0,0 +1,70 @@ |
||||
--- a/include/compat.h
|
||||
+++ b/include/compat.h
|
||||
@@ -182,6 +182,13 @@
|
||||
#define DEV_ATH CTL_UNNUMBERED
|
||||
#endif
|
||||
|
||||
+/* __skb_append got a third parameter in 2.6.14 */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
||||
+#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new)
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
|
||||
+#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new, _list)
|
||||
+#endif
|
||||
+
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _ATH_COMPAT_H_ */
|
||||
--- a/net80211/ieee80211_linux.h
|
||||
+++ b/net80211/ieee80211_linux.h
|
||||
@@ -309,13 +309,6 @@
|
||||
#define ACL_LOCK_CHECK(_as)
|
||||
#endif
|
||||
|
||||
-/* __skb_append got a third parameter in 2.6.14 */
|
||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
||||
-#define __skb_append(a,b,c) __skb_append(a, b)
|
||||
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
|
||||
-#define __skb_append(a,b,c) __skb_queue_after(c, a, b)
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* Per-node power-save queue definitions. Beware of control
|
||||
* flow with IEEE80211_NODE_SAVEQ_LOCK/IEEE80211_NODE_SAVEQ_UNLOCK.
|
||||
@@ -359,16 +352,16 @@
|
||||
_skb = __skb_dequeue(&(_ni)->ni_savedq); \
|
||||
(_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
|
||||
} while (0)
|
||||
-#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do {\
|
||||
- struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq);\
|
||||
- if (tail != NULL) { \
|
||||
- _age -= M_AGE_GET(tail); \
|
||||
- __skb_append(tail, _skb, &(_ni)->ni_savedq); \
|
||||
- } else { \
|
||||
- __skb_queue_head(&(_ni)->ni_savedq, _skb); \
|
||||
- } \
|
||||
- M_AGE_SET(_skb, _age); \
|
||||
- (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
|
||||
+#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do { \
|
||||
+ struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq); \
|
||||
+ if (tail != NULL) { \
|
||||
+ _age -= M_AGE_GET(tail); \
|
||||
+ __skb_queue_after(&(_ni)->ni_savedq, tail, _skb); \
|
||||
+ } else { \
|
||||
+ __skb_queue_head(&(_ni)->ni_savedq, _skb); \
|
||||
+ } \
|
||||
+ M_AGE_SET(_skb, _age); \
|
||||
+ (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
--- a/net80211/ieee80211_power.c
|
||||
+++ b/net80211/ieee80211_power.c
|
||||
@@ -243,7 +243,7 @@
|
||||
tail = skb_peek_tail(&ni->ni_savedq);
|
||||
if (tail != NULL) {
|
||||
age -= M_AGE_GET(tail);
|
||||
- __skb_append(tail, skb, &ni->ni_savedq);
|
||||
+ __skb_queue_after(&ni->ni_savedq, tail, skb);
|
||||
} else
|
||||
__skb_queue_head(&ni->ni_savedq, skb);
|
||||
M_AGE_SET(skb, age);
|
Loading…
Reference in new issue