diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2006-01-11 12:28:57 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-01-11 12:28:57 +0000 |
| commit | 8d331e59626c5bc26e7aa09b7d2386fae5a56dc0 (patch) | |
| tree | 426c1a782b279fc0ef28d98f96a7755454558fdc /net-wireless/ieee80211 | |
| parent | - startup default time raised to 15 seconds. (diff) | |
| download | gentoo-2-8d331e59626c5bc26e7aa09b7d2386fae5a56dc0.tar.gz gentoo-2-8d331e59626c5bc26e7aa09b7d2386fae5a56dc0.tar.bz2 gentoo-2-8d331e59626c5bc26e7aa09b7d2386fae5a56dc0.zip | |
Allow compiling against older kernels, bug #113155.
(Portage version: 2.0.53)
Diffstat (limited to 'net-wireless/ieee80211')
| -rw-r--r-- | net-wireless/ieee80211/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch | 32 | ||||
| -rw-r--r-- | net-wireless/ieee80211/ieee80211-1.1.8.ebuild | 7 |
3 files changed, 42 insertions, 3 deletions
diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog index 81d1bdb28b54..5ec35b45a191 100644 --- a/net-wireless/ieee80211/ChangeLog +++ b/net-wireless/ieee80211/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ieee80211 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.22 2006/01/09 11:24:29 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.23 2006/01/11 12:28:56 brix Exp $ + + 11 Jan 2006; Henrik Brix Andersen <brix@gentoo.org> + +files/ieee80211-1.1.8-nocast.patch, ieee80211-1.1.8.ebuild: + Allow compiling against older kernels, bug #113155. *ieee80211-1.1.8 (09 Jan 2006) diff --git a/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch b/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch new file mode 100644 index 000000000000..318844ed680a --- /dev/null +++ b/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch @@ -0,0 +1,32 @@ +diff -urp ieee80211-1.1.8/ieee80211_tx.c ieee80211-1.1.8-fix/ieee80211_tx.c +--- ieee80211-1.1.8/ieee80211_tx.c 2006-01-09 14:24:53.000000000 +0800 ++++ ieee80211-1.1.8-fix/ieee80211_tx.c 2006-01-10 13:17:00.000000000 +0800 +@@ -49,12 +49,6 @@ + #define NETDEV_TX_BUSY 1 + #endif + +-/* Fix for kernels < 2.6.12, since we use __nocast */ +-#ifndef __nocast +-#define __nocast +-#endif +- +- + /* + + 802.11 Data Frame +diff -urp ieee80211-1.1.8/net/ieee80211.h ieee80211-1.1.8-fix/net/ieee80211.h +--- ieee80211-1.1.8/net/ieee80211.h 2006-01-09 14:24:53.000000000 +0800 ++++ ieee80211-1.1.8-fix/net/ieee80211.h 2006-01-10 13:17:00.000000000 +0800 +@@ -1141,6 +1141,12 @@ static inline int is_multicast_ether_add + return addr[0] & 0x01; + } + #endif ++ ++/* Fix for kernels < 2.6.12, since we use __nocast */ ++#ifndef __nocast ++#define __nocast ++#endif ++ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) + static inline void *kzalloc(size_t size, unsigned __nocast flags) + { diff --git a/net-wireless/ieee80211/ieee80211-1.1.8.ebuild b/net-wireless/ieee80211/ieee80211-1.1.8.ebuild index 24294898cb97..4d9c52053ae8 100644 --- a/net-wireless/ieee80211/ieee80211-1.1.8.ebuild +++ b/net-wireless/ieee80211/ieee80211-1.1.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.8.ebuild,v 1.2 2006/01/09 13:26:42 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.8.ebuild,v 1.3 2006/01/11 12:28:56 brix Exp $ -inherit linux-mod +inherit eutils linux-mod # The following works with both pre-releases and releases MY_P=${P/_/-} @@ -72,6 +72,9 @@ src_unpack() { unpack ${A} + cd "${S}" + epatch ${FILESDIR}/${P}-nocast.patch + use debug && debug="y" sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile || die } |