summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2008-06-04 16:36:36 +0000
committerMichael Olbrich <m.olbrich@pengutronix.de>2008-06-04 16:36:36 +0000
commit093ed1712bd6648177594e166a6dc6720b4347f4 (patch)
tree706efe59c869f36f2c49e8a9ae0469a474752ba9 /patches
parent22235eed8d3b5eef97fa28fbf6200cb6e7229423 (diff)
downloadptxdist-093ed1712bd6648177594e166a6dc6720b4347f4.tar.gz
ptxdist-093ed1712bd6648177594e166a6dc6720b4347f4.tar.xz
* new version + patches to compile with 2.6.26
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8327 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/madwifi-0.9.4/generic/add-define-for-2.6.26.diff20
-rw-r--r--patches/madwifi-0.9.4/generic/madwifi-buildsystem-fix.diff124
-rw-r--r--patches/madwifi-0.9.4/generic/series2
3 files changed, 146 insertions, 0 deletions
diff --git a/patches/madwifi-0.9.4/generic/add-define-for-2.6.26.diff b/patches/madwifi-0.9.4/generic/add-define-for-2.6.26.diff
new file mode 100644
index 000000000..865c9c374
--- /dev/null
+++ b/patches/madwifi-0.9.4/generic/add-define-for-2.6.26.diff
@@ -0,0 +1,20 @@
+Subject: add define for __skb_append (missing in 2.6.26)
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+Copied from http://madwifi.org/ticket/1935
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+--- a/net80211/ieee80211_linux.h 2008-05-09 01:15:01 +0400
++++ b/net80211/ieee80211_linux.h 2008-05-11 02:26:35 +0400
+@@ -315,6 +315,9 @@ typedef spinlock_t acl_lock_t;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ #define __skb_append(a,b,c) __skb_append(a, b)
+ #endif
++#if 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
+
diff --git a/patches/madwifi-0.9.4/generic/madwifi-buildsystem-fix.diff b/patches/madwifi-0.9.4/generic/madwifi-buildsystem-fix.diff
new file mode 100644
index 000000000..216292dc9
--- /dev/null
+++ b/patches/madwifi-0.9.4/generic/madwifi-buildsystem-fix.diff
@@ -0,0 +1,124 @@
+Index: madwifi/net80211/Makefile
+===================================================================
+--- madwifi.orig/net80211/Makefile (revision 3067)
++++ madwifi/net80211/Makefile (revision 3603)
+@@ -40,8 +40,5 @@
+ # Makefile for the 802.11 WLAN modules.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+ #
+Index: madwifi/ath_rate/onoe/Makefile
+===================================================================
+--- madwifi.orig/ath_rate/onoe/Makefile (revision 2834)
++++ madwifi/ath_rate/onoe/Makefile (revision 3603)
+@@ -41,8 +41,5 @@
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+Index: madwifi/ath_rate/amrr/Makefile
+===================================================================
+--- madwifi.orig/ath_rate/amrr/Makefile (revision 2834)
++++ madwifi/ath_rate/amrr/Makefile (revision 3603)
+@@ -41,8 +41,5 @@
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+Index: madwifi/ath_rate/sample/Makefile
+===================================================================
+--- madwifi.orig/ath_rate/sample/Makefile (revision 2834)
++++ madwifi/ath_rate/sample/Makefile (revision 3603)
+@@ -39,8 +39,5 @@
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+Index: madwifi/ath_rate/Makefile
+===================================================================
+--- madwifi.orig/ath_rate/Makefile (revision 2235)
++++ madwifi/ath_rate/Makefile (revision 3603)
+@@ -1,6 +1,3 @@
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+Index: madwifi/ath_rate/minstrel/Makefile
+===================================================================
+--- madwifi.orig/ath_rate/minstrel/Makefile (revision 2834)
++++ madwifi/ath_rate/minstrel/Makefile (revision 3603)
+@@ -39,8 +39,5 @@
+ # Makefile for the Atheros Rate Control Support.
+ #
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/../..
+
+Index: madwifi/ath_hal/Makefile
+===================================================================
+--- madwifi.orig/ath_hal/Makefile (revision 3599)
++++ madwifi/ath_hal/Makefile (revision 3603)
+@@ -41,8 +41,5 @@
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+Index: madwifi/ath/Makefile
+===================================================================
+--- madwifi.orig/ath/Makefile (revision 3268)
++++ madwifi/ath/Makefile (revision 3603)
+@@ -41,8 +41,5 @@
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)/..
+
+Index: madwifi/Makefile
+===================================================================
+--- madwifi.orig/Makefile (revision 3225)
++++ madwifi/Makefile (revision 3603)
+@@ -41,8 +41,5 @@
+ #
+
+-ifeq ($(obj),)
+-obj= .
+-endif
+-
++obj := $(firstword $(obj) $(SUBDIRS) .)
+ TOP = $(obj)
+
diff --git a/patches/madwifi-0.9.4/generic/series b/patches/madwifi-0.9.4/generic/series
new file mode 100644
index 000000000..b028b7ecb
--- /dev/null
+++ b/patches/madwifi-0.9.4/generic/series
@@ -0,0 +1,2 @@
+add-define-for-2.6.26.diff
+madwifi-buildsystem-fix.diff -p1