Added PROPERTIES="interactive", bug #288831.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

17 files changed, 22 insertions, 1054 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 378e12ed4ea3..eb537a1fad67 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,24 @@
 # 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.15 2009/10/05 23:33:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.16 2009/10/20 13:36:07 matsuu Exp $
+
+  20 Oct 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.79.10-r4.ebuild,
+  -files/broadcom-sta-5.10.79.10-hidden-essid.patch,
+  -files/broadcom-sta-5.10.79.10-license.patch,
+  -files/broadcom-sta-5.10.79.10-linux-2.6.29.patch,
+  -files/broadcom-sta-5.10.79.10-linux-2.6.30.patch,
+  -files/broadcom-sta-5.10.79.10-r4-linux-2.6.29.patch,
+  -files/broadcom-sta-5.10.79.10-wl_iw.patch,
+  -files/broadcom-sta-5.10.79.10-wl_iw_v2.patch,
+  -broadcom-sta-5.10.91.9-r5.ebuild, -broadcom-sta-5.10.91.9-r6.ebuild,
+  -files/broadcom-sta-5.10.91.9-linux-2.6.29.patch,
+  -files/broadcom-sta-5.10.91.9-linux-2.6.30.patch,
+  -files/broadcom-sta-5.10.91.9-linux-2.6.31.patch,
+  -broadcom-sta-5.10.91.9.3.ebuild,
+  -files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch,
+  broadcom-sta-5.10.91.9.3-r1.ebuild:
+  Added PROPERTIES="interactive", bug #288831. Removed old versions.
 
 *broadcom-sta-5.10.91.9.3-r1 (05 Oct 2009)
 
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r4.ebuild
deleted file mode 100644
index 0c05ca336121..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r4.ebuild
+++ /dev/null
@@ -1,51 +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-r4.ebuild,v 1.1 2009/05/07 16:08:21 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() {
-	check_license
-
-	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}/${PF}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-linux-2.6.30.patch" \
-		"${FILESDIR}/${P}-wl_iw_v2.patch" \
-		"${FILESDIR}/${P}-license.patch"
-
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild
deleted file mode 100644
index 8ac4b3e2b606..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild
+++ /dev/null
@@ -1,54 +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.91.9-r5.ebuild,v 1.1 2009/08/01 13:17:56 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 )
-	http://www.broadcom.com/docs/linux_sta/${MY_PV}_patch_2_6_29_kernel.zip"
-
-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() {
-	check_license
-
-	if kernel_is ge 2 6 31; then
-		CONFIG_CHECK="LIB80211"
-	elif kernel_is ge 2 6 29; then
-		# bug #276057
-		CONFIG_CHECK="LIB80211 COMPAT_NET_DEV_OPS"
-	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}/${PN}-5.10.79.10-hidden-essid.patch" \
-		"${WORKDIR}/patch_2.6.29_kernels" \
-		"${FILESDIR}/${P}-license.patch" \
-		"${FILESDIR}/${P}-linux-2.6.30.patch" \
-		"${FILESDIR}/${P}-linux-2.6.31.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r6.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r6.ebuild
deleted file mode 100644
index 3966877d1de8..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r6.ebuild
+++ /dev/null
@@ -1,50 +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.91.9-r6.ebuild,v 1.1 2009/08/08 00:02:37 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() {
-	check_license
-
-	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}/${PN}-5.10.79.10-hidden-essid.patch" \
-		"${FILESDIR}/${P}-r1-linux-2.6.29.patch" \
-		"${FILESDIR}/${PN}-5.10.79.10-linux-2.6.30.patch" \
-		"${FILESDIR}/${P}-linux-2.6.31.patch" \
-		"${FILESDIR}/${P}-license.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r1.ebuild
index 8a21b262c85e..44731fdc3d15 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r1.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.91.9.3-r1.ebuild,v 1.1 2009/10/05 23:33:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3-r1.ebuild,v 1.2 2009/10/20 13:36:07 matsuu Exp $
 
 inherit eutils linux-mod
 
@@ -24,6 +24,8 @@ S="${WORKDIR}"
 MODULE_NAMES="wl(net/wireless)"
 MODULESD_WL_ALIASES=("wlan0 wl")
 
+PROPERTIES="interactive"
+
 pkg_setup() {
 	check_license
 
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild
deleted file mode 100644
index f9541fad084d..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild
+++ /dev/null
@@ -1,45 +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.91.9.3.ebuild,v 1.1 2009/09/19 16:43:22 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")
-
-pkg_setup() {
-	check_license
-
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211"
-	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"
-}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-hidden-essid.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-hidden-essid.patch
deleted file mode 100644
index 1a7e063630b0..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-hidden-essid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur ori/src/wl/sys/wl_iw.c edit/src/wl/sys/wl_iw.c
---- ori/src/wl/sys/wl_iw.c	2009-02-09 22:43:18.000000000 +0100
-+++ edit/src/wl/sys/wl_iw.c	2009-03-06 19:00:55.271406043 +0100
-@@ -580,6 +580,7 @@
- 	range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
- 	range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
- 	range->enc_capa |= IW_ENC_CAPA_WPA2;
-+	range->scan_capa = IW_SCAN_CAPA_ESSID;
- #endif 
- 
- 	return 0;
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-license.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-license.patch
deleted file mode 100644
index bea47f0b7369..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-license.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c	2009-02-10 06:43:32.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c	2009-05-08 00:23:57.000000000 +0900
-@@ -243,7 +243,7 @@
- static void wl_free_if(wl_info_t *wl, wl_if_t *wlif);
- static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info);
- 
--MODULE_LICENSE("");
-+MODULE_LICENSE("MIXED/Proprietary");
- 
- static struct pci_device_id wl_id_table[] = {
- 	{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch
deleted file mode 100644
index 92593787e959..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -u -r a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
---- a/src/wl/sys/wl_iw.c	2009-01-19 23:02:56.000000000 +0100
-+++ b/src/wl/sys/wl_iw.c	2009-01-24 12:33:59.810703840 +0100
-@@ -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;
-@@ -1111,7 +1119,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));
- 
-@@ -1135,7 +1147,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));
- 
-@@ -1795,7 +1811,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));
- 
-@@ -1926,7 +1946,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 -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
---- a/src/wl/sys/wl_linux.c	2009-01-19 23:03:09.000000000 +0100
-+++ b/src/wl/sys/wl_linux.c	2009-01-24 13:55:13.397012940 +0100
-@@ -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
-@@ -149,7 +152,11 @@
- 	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;
-+#else
- 	struct ieee80211_crypto_ops *tkipmodops;	
-+#endif
- 	struct ieee80211_tkip_data  *tkip_ucast_data;
- 	struct ieee80211_tkip_data  *tkip_bcast_data;
- #endif
-@@ -190,7 +197,11 @@
- 
- static int wl_found = 0;
- 
-+#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))	
- 
- #define WL_LOCK(wl)	spin_lock_bh(&(wl)->lock)
-@@ -350,6 +361,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;
- 
-@@ -423,10 +437,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
-@@ -725,7 +748,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;
- 	}
- 
-@@ -895,6 +922,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",
-@@ -908,7 +938,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 --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.30.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.30.patch
deleted file mode 100644
index 0427e4ed1f84..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.30.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/wl/sys/wl_linux.c.orig	2009-04-23 21:16:26.637443671 +0400
-+++ src/wl/sys/wl_linux.c	2009-04-23 21:17:58.842687327 +0400
-@@ -56,9 +56,13 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
- #include <net/lib80211.h>
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
-+#include <linux/ieee80211.h>
-+#else
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
- #include <net/ieee80211.h>
- #endif
-+#endif
- 
- #include <asm/system.h>
- #include <asm/io.h>
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-r4-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-r4-linux-2.6.29.patch
deleted file mode 100644
index 21ad4d79fc10..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-r4-linux-2.6.29.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -Naur hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_iw.c
---- hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_iw.c	2009-02-10 06:43:18.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_iw.c	2009-05-08 00:18:36.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;
-@@ -1111,7 +1119,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));
- 
-@@ -1135,7 +1147,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));
- 
-@@ -1795,7 +1811,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));
- 
-@@ -1926,7 +1946,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 hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c	2009-02-10 06:43:32.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c	2009-05-08 00:21:50.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
-@@ -149,7 +152,11 @@
- 	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;
-+#else
- 	struct ieee80211_crypto_ops *tkipmodops;	
-+#endif
- 	struct ieee80211_tkip_data  *tkip_ucast_data;
- 	struct ieee80211_tkip_data  *tkip_bcast_data;
- #endif
-@@ -201,7 +208,11 @@
- 
- static int wl_found = 0;
- 
-+#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))	
- 
- #define WL_LOCK(wl)	spin_lock_bh(&(wl)->lock)
-@@ -363,6 +374,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;
- 
-@@ -436,10 +450,20 @@
- 
- #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");
-+		request_module("lib80211_crypt_tkip");
-+		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
-@@ -744,7 +768,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;
- 	}
- 
-@@ -912,7 +940,10 @@
- 	strncpy(dev->name, name, IFNAMSIZ);
- #else
- 
--	dev = alloc_netdev(0, name, ether_setup);
-+	dev = alloc_netdev(sizeof(wl_if_t), 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",
-@@ -926,7 +957,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 --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw.patch
deleted file mode 100644
index 125bbf4945fa..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur broadcom-sta-5.10.79.10.orig/src/wl/sys/wl_iw.c broadcom-sta-5.10.79.10/src/wl/sys/wl_iw.c
---- broadcom-sta-5.10.79.10.orig/src/wl/sys/wl_iw.c	2009-02-10 06:43:18.000000000 +0900
-+++ broadcom-sta-5.10.79.10/src/wl/sys/wl_iw.c	2009-03-25 08:37:56.000000000 +0900
-@@ -2390,7 +2390,7 @@
- 
- 			cmd = IWEVPMKIDCAND;
- 			pmkcandlist = data;
--			count = pmkcandlist->npmkid_cand;
-+			count = ntoh32(pmkcandlist->npmkid_cand);
- 			wrqu.data.length = sizeof(struct iw_pmkid_cand);
- 			pmkidcand = pmkcandlist->pmkid_cand;
- 			while (count) {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw_v2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw_v2.patch
deleted file mode 100644
index 4b38375b7ab8..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-wl_iw_v2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur broadcom-sta-5.10.79.10.orig/src/wl/sys/wl_iw.c broadcom-sta-5.10.79.10/src/wl/sys/wl_iw.c
---- broadcom-sta-5.10.79.10.orig/src/wl/sys/wl_iw.c	2009-02-10 06:43:18.000000000 +0900
-+++ broadcom-sta-5.10.79.10/src/wl/sys/wl_iw.c	2009-04-08 00:58:26.000000000 +0900
-@@ -1094,7 +1094,6 @@
- 	ssid.SSID_len = dtoh32(ssid.SSID_len);
- 
- 	memcpy(extra, ssid.SSID, ssid.SSID_len);
--	extra[ssid.SSID_len] = '\0';
- 
- 	dwrq->length = ssid.SSID_len;
- 
-@@ -2390,7 +2389,7 @@
- 
- 			cmd = IWEVPMKIDCAND;
- 			pmkcandlist = data;
--			count = pmkcandlist->npmkid_cand;
-+			count = ntoh32(pmkcandlist->npmkid_cand);
- 			wrqu.data.length = sizeof(struct iw_pmkid_cand);
- 			pmkidcand = pmkcandlist->pmkid_cand;
- 			while (count) {
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
deleted file mode 100644
index 979a63b4570d..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-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;		
- 
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.30.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.30.patch
deleted file mode 100644
index dc98b6be3851..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.30.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur broadcom-sta-5.10.91.9.orig/src/wl/sys/wl_linux.c broadcom-sta-5.10.91.9/src/wl/sys/wl_linux.c
---- broadcom-sta-5.10.91.9.orig/src/wl/sys/wl_linux.c	2009-07-17 05:13:13.000000000 +0900
-+++ broadcom-sta-5.10.91.9/src/wl/sys/wl_linux.c	2009-07-17 05:17:34.000000000 +0900
-@@ -56,6 +56,9 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
- #include <net/lib80211.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
-+#include <linux/ieee80211.h>
-+#endif
- #else
- #include <net/ieee80211.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch
deleted file mode 100644
index ac31fbde3ec3..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.31.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/wl/sys/wl_linux.c.orig.1	2009-07-12 13:28:30.000000000 -0700
-+++ src/wl/sys/wl_linux.c	2009-07-12 15:46:52.000000000 -0700
-@@ -222,9 +222,23 @@
- };
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+static const struct net_device_ops wl_net_device_ops =
-+{
-+	.ndo_open = wl_open,
-+	.ndo_stop = wl_close,
-+	.ndo_start_xmit = wl_start,
-+	.ndo_get_stats = wl_get_stats,
-+	.ndo_set_mac_address = wl_set_mac_address,
-+	.ndo_set_multicast_list = wl_set_multicast_list,
-+	.ndo_do_ioctl = wl_ioctl,
-+};
-+#endif
-+
- static
- void wl_if_setup(struct net_device *dev)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	dev->open = wl_open;
- 	dev->stop = wl_close;
- 	dev->hard_start_xmit = wl_start;
-@@ -232,6 +246,9 @@
- 	dev->set_mac_address = wl_set_mac_address;
- 	dev->set_multicast_list = wl_set_multicast_list;
- 	dev->do_ioctl = wl_ioctl;
-+#else
-+	dev->netdev_ops = &wl_net_device_ops;
-+#endif
- #ifdef CONFIG_WIRELESS_EXT
- #if WIRELESS_EXT < 19
- 	dev->get_wireless_stats = wl_get_wireless_stats;
---- src/wl/sys/wl_iw.c.orig.1	2009-07-12 13:40:51.000000000 -0700
-+++ src/wl/sys/wl_iw.c	2009-07-12 15:46:39.000000000 -0700
-@@ -124,7 +124,11 @@
- 
- 	fs = get_fs();
- 	set_fs(get_ds());
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-+#else
-+	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
-+#endif
- 	set_fs(fs);
- 
- 	return ret;
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch
deleted file mode 100644
index 2e8de221cad0..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c
---- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c	2009-04-23 02:46:35.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c	2009-05-08 00:42:45.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 hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c	2009-04-23 02:48:59.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c	2009-05-08 00:45:29.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,20 @@
- 
- #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");
-+		request_module("lib80211_crypt_tkip");
-+		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 +686,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;
- 	}
- 
-@@ -833,7 +857,10 @@
- 	strncpy(dev->name, name, IFNAMSIZ);
- #else
- 
--	dev = alloc_netdev(0, name, ether_setup);
-+	dev = alloc_netdev(sizeof(wl_if_t), 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 +874,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 hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h
---- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h	2009-04-23 02:49:04.000000000 +0900
-+++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h	2009-05-08 00:42:45.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;		
-