Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-wireless
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-02-05 20:16:44 +0000
committerDaniel Drake <dsd@gentoo.org>2007-02-05 20:16:44 +0000
commitef5be1ba95fedbdb184c5242f4df7f18cfa260b3 (patch)
treef2ed08bb5a98ed50d02cd7d752d70064b3e4e642 /net-wireless
parentDep for Email-MIME-Creator (diff)
downloadhistorical-ef5be1ba95fedbdb184c5242f4df7f18cfa260b3.tar.gz
historical-ef5be1ba95fedbdb184c5242f4df7f18cfa260b3.tar.bz2
historical-ef5be1ba95fedbdb184c5242f4df7f18cfa260b3.zip
Move patches into src_unpack, and add 2.6.20 compatibility patch
Package-Manager: portage-2.1.2-r7
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/madwifi-ng/ChangeLog6
-rw-r--r--net-wireless/madwifi-ng/Manifest24
-rw-r--r--net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch151
-rw-r--r--net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild8
4 files changed, 173 insertions, 16 deletions
diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 36d3348390be..8501c7abc2ae 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/madwifi-ng
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.22 2007/01/29 23:01:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.23 2007/02/05 20:16:44 dsd Exp $
+
+ 05 Feb 2007; Daniel Drake <dsd@gentoo.org>
+ +files/madwifi-ng-0.9.2.1-linux-2.6.20.patch, madwifi-ng-0.9.2.1.ebuild:
+ Move patches into src_unpack, and add 2.6.20 compatibility patch
29 Jan 2007; <genstef@gentoo.org> +files/madwifi-ng-r1886.patch,
madwifi-ng-0.9.2.1.ebuild:
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 1c3915102127..b2ed4345e197 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -14,6 +14,10 @@ AUX madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e381761
MD5 7ec7bc646805244f713c1afdb698f211 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
RMD160 96450d5320e3817612880e86342c699f297680d3 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
+AUX madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244 RMD160 ca8d3c869c84861b8a33d53f8bcd47e9451a8603 SHA1 7902ef5c29b1cec356e38d54960879ba57e3bc78 SHA256 6bbdca5a514ec04aaa5beae2e8d91aab35a735988160f1cd54505531e621e1de
+MD5 cc0c49f8d4d8f70b6e57c258ccd6f5d2 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244
+RMD160 ca8d3c869c84861b8a33d53f8bcd47e9451a8603 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244
+SHA256 6bbdca5a514ec04aaa5beae2e8d91aab35a735988160f1cd54505531e621e1de files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244
AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe
MD5 e72b6534fc8941fd6c890f2ecbf470e6 files/madwifi-ng-r1886.patch 965
RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b files/madwifi-ng-r1886.patch 965
@@ -24,22 +28,18 @@ RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-f
SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d files/madwifi-ng-uudecode-gcda-fix.patch 328
DIST madwifi-0.9.2.1.tar.bz2 3476892 RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e SHA1 6606291b6facc299203158bfaa1bde09219459db SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843
DIST madwifi-0.9.2.tar.bz2 3476735 RMD160 e24ce96ab7ebcd12e71755c89882a90161a6a15a SHA1 6d6b9d2419e45a940d156b928401b5c688c40844 SHA256 b6edd998fa5e5927f9e42e0470f6f4e0bec1b8a41658eec5595ceea01c787153
-EBUILD madwifi-ng-0.9.2.1.ebuild 4072 RMD160 1c576ea7da3b0c6d5c8cdf5e1583770781adb9b7 SHA1 7a359d76a3301950b97ca888ffdd725e71ee2ae2 SHA256 d6446edbc7105de8b39d12a3fc78a2fa9c9d0548549265726514cfd3928b7795
-MD5 9366ae7e7ac8078cf5624bb0326b66dc madwifi-ng-0.9.2.1.ebuild 4072
-RMD160 1c576ea7da3b0c6d5c8cdf5e1583770781adb9b7 madwifi-ng-0.9.2.1.ebuild 4072
-SHA256 d6446edbc7105de8b39d12a3fc78a2fa9c9d0548549265726514cfd3928b7795 madwifi-ng-0.9.2.1.ebuild 4072
+EBUILD madwifi-ng-0.9.2.1.ebuild 4113 RMD160 890b16385bd90a9deb92a832e24da60925fa7b4c SHA1 271db1ccd9fdc205a3a6798ab84d7b915ed5a9ff SHA256 a0ccf6d36b3932e78a238dd70c46b4e0a757192a79ef69e49331eb0d44dd5ede
+MD5 b6b8e0be9647156a4af1bf35c252d74a madwifi-ng-0.9.2.1.ebuild 4113
+RMD160 890b16385bd90a9deb92a832e24da60925fa7b4c madwifi-ng-0.9.2.1.ebuild 4113
+SHA256 a0ccf6d36b3932e78a238dd70c46b4e0a757192a79ef69e49331eb0d44dd5ede madwifi-ng-0.9.2.1.ebuild 4113
EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a SHA1 3b8378b22791ac5a529e8aca0727ccd79ef790c1 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6
MD5 82d58a8bcb92317ce472b3ef6cf4e717 madwifi-ng-0.9.2.ebuild 3979
RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a madwifi-ng-0.9.2.ebuild 3979
SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 madwifi-ng-0.9.2.ebuild 3979
-MISC ChangeLog 13455 RMD160 5cb47763d6220797846a24d2ddc2eaa31a4d8e7f SHA1 314af20efee21f6af7acb1ea4a4d4a8098d4d872 SHA256 e2785df86bd0f08931cb608b41c8dfcec13928c69286eb29a0e90342f43d72c5
-MD5 fbcedc665bdf22d70a979f6d56b301fa ChangeLog 13455
-RMD160 5cb47763d6220797846a24d2ddc2eaa31a4d8e7f ChangeLog 13455
-SHA256 e2785df86bd0f08931cb608b41c8dfcec13928c69286eb29a0e90342f43d72c5 ChangeLog 13455
-MISC madwifi-ng-0.9.2.1.ebuild.orig 3993 RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 SHA1 4e89873b6c12f6b032858107ee19d9ef65028f13 SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c
-MD5 04f075160d9d021d7babd15e7ffd7d10 madwifi-ng-0.9.2.1.ebuild.orig 3993
-RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 madwifi-ng-0.9.2.1.ebuild.orig 3993
-SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c madwifi-ng-0.9.2.1.ebuild.orig 3993
+MISC ChangeLog 13639 RMD160 f37254877752c073d6ba5a203c633d7c15574997 SHA1 9661784ac465f3447d37e52d2e558eee28f2370a SHA256 b77e1dfde37e1b1859ccc6fdf1205326b1e80842695dc3d1362ac96e5b8e2cde
+MD5 9984e29ad49e5cf701a81d9b10cc18d0 ChangeLog 13639
+RMD160 f37254877752c073d6ba5a203c633d7c15574997 ChangeLog 13639
+SHA256 b77e1dfde37e1b1859ccc6fdf1205326b1e80842695dc3d1362ac96e5b8e2cde ChangeLog 13639
MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch
new file mode 100644
index 000000000000..cabdbb6c547c
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch
@@ -0,0 +1,151 @@
+Index: madwifi-0.9.2.1/ath/if_ath.c
+===================================================================
+--- madwifi-0.9.2.1.orig/ath/if_ath.c
++++ madwifi-0.9.2.1/ath/if_ath.c
+@@ -118,7 +118,7 @@ static void ath_fatal_tasklet(TQUEUE_ARG
+ static void ath_rxorn_tasklet(TQUEUE_ARG);
+ static void ath_bmiss_tasklet(TQUEUE_ARG);
+ static void ath_bstuck_tasklet(TQUEUE_ARG);
+-static void ath_radar_task(TQUEUE_ARG);
++static void ath_radar_task(struct work_struct *);
+ static void ath_dfs_test_return(unsigned long);
+
+ static int ath_stop_locked(struct net_device *);
+@@ -414,7 +414,7 @@ ath_attach(u_int16_t devid, struct net_d
+ ATH_INIT_TQUEUE(&sc->sc_bstucktq,ath_bstuck_tasklet, dev);
+ ATH_INIT_TQUEUE(&sc->sc_rxorntq, ath_rxorn_tasklet, dev);
+ ATH_INIT_TQUEUE(&sc->sc_fataltq, ath_fatal_tasklet, dev);
+- ATH_INIT_SCHED_TASK(&sc->sc_radartask, ath_radar_task, dev);
++ ATH_INIT_WORK(&sc->sc_radartask, ath_radar_task);
+
+ /*
+ * Attach the hal and verify ABI compatibility by checking
+@@ -934,7 +934,7 @@ ath_detach(struct net_device *dev)
+ ath_hal_setpower(sc->sc_ah, HAL_PM_AWAKE);
+ /* Flush the radar task if it's scheduled */
+ if (sc->sc_rtasksched == 1)
+- ATH_FLUSH_TASKS();
++ flush_scheduled_work();
+
+ sc->sc_invalid = 1;
+
+@@ -1707,10 +1707,9 @@ ath_intr(int irq, void *dev_id, struct p
+ }
+
+ static void
+-ath_radar_task(TQUEUE_ARG data)
++ath_radar_task(struct work_struct *thr)
+ {
+- struct net_device *dev = (struct net_device *)data;
+- struct ath_softc *sc = dev->priv;
++ struct ath_softc *sc = container_of(thr, struct ath_softc, sc_radartask);
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211_channel ichan;
+@@ -5634,7 +5633,7 @@ rx_next:
+ ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan);
+ if (ath_hal_radar_event(ah)) {
+ sc->sc_rtasksched = 1;
+- ATH_SCHEDULE_TASK(&sc->sc_radartask);
++ schedule_work(&sc->sc_radartask);
+ }
+ #undef PA2DESC
+ }
+Index: madwifi-0.9.2.1/ath/if_athvar.h
+===================================================================
+--- madwifi-0.9.2.1.orig/ath/if_athvar.h
++++ madwifi-0.9.2.1/ath/if_athvar.h
+@@ -71,22 +71,22 @@ typedef void *TQUEUE_ARG;
+ #include <linux/sched.h>
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
+ #include <linux/tqueue.h>
+-#define ATH_WORK_THREAD tq_struct
+-#define ATH_SCHEDULE_TASK(t) schedule_task((t))
+-#define ATH_INIT_SCHED_TASK(t, f, d) do { \
++#define work_struct tq_struct
++#define schedule_work(t) schedule_task((t))
++#define flush_scheduled_work() flush_scheduled_tasks()
++#define ATH_INIT_WORK(t, f) do { \
+ memset((t),0,sizeof(struct tq_struct)); \
+ (t)->routine = (void (*)(void*)) (f); \
+- (t)->data=(void *) (d); \
++ (t)->data=(void *) (t); \
+ } while (0)
+-#define ATH_FLUSH_TASKS flush_scheduled_tasks
+ #else
+ #include <linux/workqueue.h>
+-#define ATH_SCHEDULE_TASK(t) schedule_work((t))
+
+-#define ATH_INIT_SCHED_TASK(_t, _f, _d) INIT_WORK((_t), (void (*)(void *))(_f), (void *)(_d));
+-
+-#define ATH_WORK_THREAD work_struct
+-#define ATH_FLUSH_TASKS flush_scheduled_work
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (void (*)(void *))(_f), (void *)(_t));
++#else
++#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (_f));
++#endif
+ #endif /* KERNEL_VERSION < 2.5.41 */
+
+ /*
+@@ -613,7 +613,7 @@ struct ath_softc {
+
+ struct timer_list sc_cal_ch; /* calibration timer */
+ HAL_NODE_STATS sc_halstats; /* station-mode rssi stats */
+- struct ATH_WORK_THREAD sc_radartask; /* Schedule task for DFS handling */
++ struct work_struct sc_radartask; /* Schedule task for DFS handling */
+
+ #ifdef CONFIG_SYSCTL
+ struct ctl_table_header *sc_sysctl_header;
+Index: madwifi-0.9.2.1/hal/linux/ah_osdep.c
+===================================================================
+--- madwifi-0.9.2.1.orig/hal/linux/ah_osdep.c
++++ madwifi-0.9.2.1/hal/linux/ah_osdep.c
+@@ -51,6 +51,7 @@
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/delay.h>
++#include <linux/jiffies.h>
+
+ #include <linux/sysctl.h>
+ #include <linux/proc_fs.h>
+Index: madwifi-0.9.2.1/net80211/ieee80211_linux.h
+===================================================================
+--- madwifi-0.9.2.1.orig/net80211/ieee80211_linux.h
++++ madwifi-0.9.2.1/net80211/ieee80211_linux.h
+@@ -276,9 +276,15 @@ struct ieee80211_cb {
+ * mbuf packet header to store this data.
+ * XXX use private cb area
+ */
+-#define M_AGE_SET(skb,v) (skb->csum = v)
+-#define M_AGE_GET(skb) (skb->csum)
+-#define M_AGE_SUB(skb,adj) (skb->csum -= adj)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++#define skb_age csum_offset
++#else
++#define skb_age csum
++#endif
++
++#define M_AGE_SET(skb,v) (skb->skb_age = v)
++#define M_AGE_GET(skb) (skb->skb_age)
++#define M_AGE_SUB(skb,adj) (skb->skb_age -= adj)
+
+ struct ieee80211com;
+ struct ieee80211vap;
+@@ -415,6 +421,8 @@ static __inline unsigned long msecs_to_j
+
+ #endif
+
++#include <linux/jiffies.h>
++
+ #ifndef CLONE_KERNEL
+ /*
+ * List of flags we want to share for kernel threads,
+@@ -423,6 +431,7 @@ static __inline unsigned long msecs_to_j
+ #define CLONE_KERNEL (CLONE_FS | CLONE_FILES | CLONE_SIGHAND)
+ #endif
+
++#include <linux/mm.h>
+ #ifndef offset_in_page
+ #define offset_in_page(p) ((unsigned long) (p) & ~PAGE_MASK)
+ #endif
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
index f2304d89034a..cb79f2e0d73b 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.5 2007/01/29 23:01:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.6 2007/02/05 20:16:44 dsd Exp $
inherit linux-mod
@@ -72,13 +72,15 @@ src_unpack() {
for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
convert_to_m ${S}/${dir}/Makefile
done
-}
-src_compile() {
epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch
if use injection; then epatch ${FILESDIR}/madwifi-ng-r1886.patch; fi
# epatch ${FILESDIR}/madwifi-association-fix.patch
+ epatch ${FILESDIR}/${P}-linux-2.6.20.patch
+}
+
+src_compile() {
# assists in debugging
emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed"