[Frugalware-git] kernel2632: madwifi-0.9.4-31-i686

Miklos Vajna vmiklos at frugalware.org
Sun Dec 6 00:00:36 CET 2009


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2632.git;a=commitdiff;h=467951f247e3b1202954a5180cf80e7019fa3a3f

commit 467951f247e3b1202954a5180cf80e7019fa3a3f
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Dec 5 23:42:31 2009 +0100

madwifi-0.9.4-31-i686

- add kernel-2.6.32.patch

diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild
index c111d4a..a28b31c 100644
--- a/source/network/madwifi/FrugalBuild
+++ b/source/network/madwifi/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=madwifi
pkgver=0.9.4
-pkgrel=30
+pkgrel=31
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
Finclude kernel-module
depends=(${depends[@]} 'wireless_tools')
@@ -13,14 +13,15 @@ groups=('network')
archs=('i686' 'x86_64')
Finclude sourceforge
url="http://madwifi.sourceforge.net/"
-source=($source madwifi-0.9.3-cflags.diff kernel-2.6.2{6,7,9}.patch kernel-2.6.3{0,1}.patch)
+source=($source madwifi-0.9.3-cflags.diff kernel-2.6.2{6,7,9}.patch kernel-2.6.3{0,1,2}.patch)
sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \
'26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \
'41928bbfdbb4e1c1fa5c1ed93fb673542c18bbc3' \
'd13a31f131b227838046c384e04cb32922b481bf' \
'0afa565128984ebcae441580b83eb916a2f3f09c' \
'8e9aef8b6d7fe815bb0816f107b65cda362d520e' \
-          '49e925f5a0a1705e9e9475f44f4005d6576fe51b')
+          '49e925f5a0a1705e9e9475f44f4005d6576fe51b' \
+          'e066b925df4e9119879fc23818c18ae62ef3008a')

# If the package needs testing, feel free to poke Benjamin Woods <woodsb02 at gmail.com>

diff --git a/source/network/madwifi/kernel-2.6.32.patch b/source/network/madwifi/kernel-2.6.32.patch
new file mode 100644
index 0000000..0055aa3
--- /dev/null
+++ b/source/network/madwifi/kernel-2.6.32.patch
@@ -0,0 +1,48 @@
+Index: net80211/ieee80211_linux.h
+===================================================================
+--- net80211/ieee80211_linux.h	(revision 4098)
++++ net80211/ieee80211_linux.h	(revision 4099)
+@@ -595,12 +595,18 @@
+ 	  void __user *buffer, size_t *lenp)
+ #define	IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+ 	proc_dointvec(ctl, write, filp, buffer, lenp)
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+ #define	IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
+ 	f(ctl_table *ctl, int write, struct file *filp, \
+ 	  void __user *buffer, size_t *lenp, loff_t *ppos)
+ #define	IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+ 	proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
++#else /* Linux 2.6.32+ */
++#define	IEEE80211_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
++	f(ctl_table *ctl, int write, \
++	  void __user *buffer, size_t *lenp, loff_t *ppos)
++#define	IEEE80211_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
++	proc_dointvec(ctl, write, buffer, lenp, ppos)
+ #endif
+
+ void ieee80211_virtfs_latevattach(struct ieee80211vap *);
+Index: ath/if_athvar.h
+===================================================================
+--- ath/if_athvar.h	(revision 4098)
++++ ath/if_athvar.h	(revision 4099)
+@@ -174,12 +174,18 @@
+ 	  void __user *buffer, size_t *lenp)
+ #define	ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+ 	proc_dointvec(ctl, write, filp, buffer, lenp)
+-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+ #define	ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
+ 	f(ctl_table *ctl, int write, struct file *filp, \
+ 	  void __user *buffer, size_t *lenp, loff_t *ppos)
+ #define	ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
+ 	proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
++#else /* Linux 2.6.32+ */
++#define	ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
++	f(ctl_table *ctl, int write, \
++	  void __user *buffer, size_t *lenp, loff_t *ppos)
++#define	ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
++	proc_dointvec(ctl, write, buffer, lenp, ppos)
+ #endif
+
+ #define	ATH_TIMEOUT	1000


More information about the Frugalware-git mailing list