linux-2.6.32 support, bug #295930.

(Portage version: 2.1.7.10/cvs/Linux x86_64)

3 files changed, 71 insertions, 1 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index eb537a1fad67..157a1c6f77e9 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.16 2009/10/20 13:36:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.17 2009/12/07 15:47:15 matsuu Exp $
+
+*broadcom-sta-5.10.91.9.3-r2 (07 Dec 2009)
+
+  07 Dec 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +broadcom-sta-5.10.91.9.3-r2.ebuild,
+  +files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch:
+  linux-2.6.32 support, bug #295930.
 
   20 Oct 2009; MATSUU Takuto <matsuu@gentoo.org>
   -broadcom-sta-5.10.79.10-r4.ebuild,
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r2.ebuild
new file mode 100644
index 000000000000..b93830ca9340
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r2.ebuild,v 1.1 2009/12/07 15:47:15 matsuu Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_"
+SRC_URI="x86? ( ${SRC_BASE}32-v${PV}.tar.gz )
+	amd64? ( ${SRC_BASE}64-v${PV}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror"
+
+DEPEND=">=virtual/linux-sources-2.6.22"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+PROPERTIES="interactive"
+
+pkg_setup() {
+	check_license
+
+	CONFIG_CHECK="~!B43 ~!SSB"
+	if kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+	linux-mod_pkg_setup
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
+		"${FILESDIR}/${P}-linux-2.6.32.patch"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
new file mode 100644
index 000000000000..956cb5c8176c
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
@@ -0,0 +1,13 @@
+diff -rup hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c
+--- hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c	2009-09-10 20:21:58.000000000 +0200
++++ hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c	2009-12-07 12:51:20.000000000 +0100
+@@ -40,6 +40,9 @@
+ #include <linux/pci_ids.h>
+ #define WLC_MAXBSSCFG		1	
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
++#include <linux/sched.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ #include <net/lib80211.h>
+ #endif