Version bumped, bug #248450.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

5 files changed, 194 insertions, 96 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 1320b8f8b3bf..cccc08540cc0 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2009/04/25 01:31:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.5 2009/05/03 01:25:18 matsuu Exp $
+
+*broadcom-sta-5.10.91.9 (03 May 2009)
+
+  03 May 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.79.10.ebuild, -broadcom-sta-5.10.79.10-r1.ebuild,
+  -broadcom-sta-5.10.79.10-r2.ebuild, +broadcom-sta-5.10.91.9.ebuild,
+  +files/broadcom-sta-5.10.91.9-linux-2.6.29.patch:
+  Version bumped, bug #248450.
 
 *broadcom-sta-5.10.79.10-r3 (25 Apr 2009)
 
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild
deleted file mode 100644
index 0f717896e8fc..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.79.10-r2.ebuild,v 1.1 2009/04/07 16:01:49 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-MY_PV="$(replace_all_version_separators _)"
-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${MY_PV}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${MY_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")
-
-pkg_setup() {
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
-	else
-		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}/${P}-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-wl_iw_v2.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild
deleted file mode 100644
index 5082f5f1d02f..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.79.10.ebuild,v 1.1 2009/03/10 17:27:12 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-MY_PV="$(replace_all_version_separators _)"
-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${MY_PV}.tar.gz )
-	amd64?	( ${SRC_BASE}_64-v${MY_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")
-
-pkg_setup() {
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
-	else
-		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}/${P}-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild
index 169c8562d955..d7b83aefa853 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild
@@ -1,6 +1,6 @@
 # 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.79.10-r1.ebuild,v 1.1 2009/03/25 14:47:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild,v 1.1 2009/05/03 01:25:18 matsuu Exp $
 
 inherit eutils linux-mod versionator
 
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch \
-		"${FILESDIR}/${P}-hidden-essid.patch" \
+		"${FILESDIR}/${PN}-5.10.79.10-hidden-essid.patch" \
 		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-wl_iw.patch"
+		"${FILESDIR}/${PN}-5.10.79.10-linux-2.6.30.patch"
 }
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch
new file mode 100644
index 000000000000..979a63b4570d
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch
@@ -0,0 +1,182 @@
+diff -Naur a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
+--- a/src/wl/sys/wl_iw.c	2009-04-23 02:51:58.000000000 +0900
++++ b/src/wl/sys/wl_iw.c	2009-05-03 09:13:38.000000000 +0900
+@@ -610,7 +610,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 	struct sockaddr *addr = (struct sockaddr *) extra;
+ 	int i;
+ 
+@@ -635,7 +639,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 	struct sockaddr *addr = (struct sockaddr *) extra;
+ 	struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
+ 	int i;
+@@ -1110,7 +1118,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
+ 
+@@ -1134,7 +1146,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
+ 
+@@ -1790,7 +1806,11 @@
+ 	int paramid;
+ 	int paramval;
+ 	int val = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
+ 
+@@ -1921,7 +1941,11 @@
+ 	int paramid;
+ 	int paramval = 0;
+ 	int val;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
+ 
+diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2009-04-23 02:52:08.000000000 +0900
++++ b/src/wl/sys/wl_linux.c	2009-05-03 09:13:38.000000000 +0900
+@@ -53,6 +53,9 @@
+ #include <linux/pci_ids.h>
+ #define WLC_MAXBSSCFG		1	
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++#include <net/lib80211.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+ #include <net/ieee80211.h>
+ #endif
+@@ -130,7 +133,11 @@
+ 	u8 rx_hdr[16], tx_hdr[16];
+ };
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++#define	WL_DEV_IF(dev)		((wl_if_t*)netdev_priv(dev))
++#else
+ #define	WL_DEV_IF(dev)		((wl_if_t*)(dev)->priv)			
++#endif
+ #define	WL_INFO(dev)		((wl_info_t*)(WL_DEV_IF(dev)->wl))	
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+@@ -282,6 +289,9 @@
+ 	dev = wlif->dev;
+ 	wl->dev = dev;
+ 	wl_if_setup(dev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wlif = netdev_priv(dev);
++#endif
+ 
+ 	dev->base_addr = regs;
+ 
+@@ -359,10 +369,19 @@
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
++#else
+ 	wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
++#endif
+ 	if (wl->tkipmodops == NULL) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++		request_module("lib80211");
++		wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
++#else
+ 		request_module("ieee80211_crypt_tkip");
+ 		wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
++#endif
+ 	}
+ #endif 
+ #ifdef CONFIG_WIRELESS_EXT
+@@ -666,7 +685,11 @@
+ 	}
+ 
+ 	if (wl->monitor) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++		wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
++#else
+ 		wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
++#endif
+ 		wl->monitor = NULL;
+ 	}
+ 
+@@ -834,6 +857,9 @@
+ #else
+ 
+ 	dev = alloc_netdev(0, name, ether_setup);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wlif = netdev_priv(dev);
++#endif
+ 	if (!dev) {
+ 		MFREE(wl->osh, wlif, sizeof(wl_if_t));
+ 		WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
+@@ -847,7 +873,9 @@
+ 	wlif->wl = wl;
+ 	wlif->wlcif = wlcif;
+ 	wlif->subunit = subunit;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+ 	dev->priv = wlif;
++#endif
+ 
+ 	if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
+ 		netif_stop_queue(dev);
+diff -Naur a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
+--- a/src/wl/sys/wl_linux.h	2009-04-23 02:52:13.000000000 +0900
++++ b/src/wl/sys/wl_linux.h	2009-05-03 10:14:47.000000000 +0900
+@@ -85,10 +85,16 @@
+ 	bool		resched;	
+ 	uint32		pci_psstate[16];	
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	struct lib80211_crypto_ops *tkipmodops;
++	struct lib80211_tkip_data  *tkip_ucast_data;
++	struct lib80211_tkip_data  *tkip_bcast_data;
++#else
+ 	struct ieee80211_crypto_ops *tkipmodops;	
+ 	struct ieee80211_tkip_data  *tkip_ucast_data;
+ 	struct ieee80211_tkip_data  *tkip_bcast_data;
+ #endif
++#endif
+ 
+ 	uint	stats_id;		
+