summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMATSUU Takuto <matsuu@gentoo.org>2009-03-08 12:11:10 +0900
committerMATSUU Takuto <matsuu@gentoo.org>2009-03-08 12:11:10 +0900
commit0dd17a64c7e948cfdd3e010e12db5e69ebf16c54 (patch)
treeb54023cb95135b0fd6eb4a93ccfb04005def41df /net-wireless
parentnet-wireless/broadcom-sta: clean up. (diff)
downloadmatsuu-0dd17a64c7e948cfdd3e010e12db5e69ebf16c54.tar.gz
matsuu-0dd17a64c7e948cfdd3e010e12db5e69ebf16c54.tar.bz2
matsuu-0dd17a64c7e948cfdd3e010e12db5e69ebf16c54.zip
net-wireless/broadcom-sta: Version bumped.
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/broadcom-sta/Manifest5
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild42
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-hidden-essid.patch11
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch174
4 files changed, 232 insertions, 0 deletions
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 25d7afb..2b7f4be 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,4 +1,9 @@
AUX broadcom-sta-5.10.27.14-kernel-2.6.29.patch 4398 RMD160 99e2b0307268ace12984649eba8dddeba0955b0c SHA1 baad8c813a67806f3d32ba959ed0dcd1a5c5abb3 SHA256 0aa45ad9777ff2e20d01807c1b14c34f152cd576e4ccdaf7648cf57cadfd3c12
+AUX broadcom-sta-5.10.79.10-hidden-essid.patch 400 RMD160 5da005defd53cce782a0a8b6c67259bcf6536890 SHA1 f0bafa2c144ad0d904ea2348fd2b4f49c6b352b6 SHA256 aabe98ae9fe3574c3dab24090d0fe27e09d41f72326b7fc746bba030219e2bc4
+AUX broadcom-sta-5.10.79.10-linux-2.6.29.patch 4355 RMD160 7260e5b9a794cc53971bff481860a3659122f0cb SHA1 8bf29049acb49ba4837054085db87c4b4f0f5993 SHA256 924f98922cce5ee0fc62216dbe8e6ba7ffa1a80908685d48d598804526bc7723
DIST hybrid-portsrc-x86_32-v5_10_27_14.tar.gz 524816 RMD160 5f5aadbc417027cc97e6ad1999fd284a881c395c SHA1 96518ad3cc075bcc08c7574fcb0ac5ae8564f8be SHA256 56729847411618a0ab9af6c5024e031ccfe2b86137c90d465f792fcb26a572e4
+DIST hybrid-portsrc-x86_32-v5_10_79_10.tar.gz 697799 RMD160 3a91a8b91d7b062f3ce8ceb55435ca7c1362effa SHA1 f5f2650395dd18b6403a456877ddb55e89b72eba SHA256 f9084cc1393f48d9ca546448e5a5caf49f8f25614353596256039144d2bb5f25
DIST hybrid-portsrc-x86_64-v5_10_27_14.tar.gz 523323 RMD160 9abd9cbd0cfa9de399b979442bd8f86a5d861077 SHA1 d31976a2c754e166c1e91fceb9984aeb306e1e2e SHA256 b617b44c6a9e093be30be503092fad3a3b18b4161da5edabf6853e16d9a8b7d4
+DIST hybrid-portsrc-x86_64-v5_10_79_10.tar.gz 694247 RMD160 75b7e5c74957bc6bf5fbdeb28ec2c68f1d835f1a SHA1 f7bcfd6990d273b7af9f6fd7764f5359a3fbebc7 SHA256 1815cb78ddebd4d21243d83ef073f799707dd7908e64456e81be4a4d45bedc02
EBUILD broadcom-sta-5.10.27.14.ebuild 1192 RMD160 ec6ba4f7f50ba08db7c70cf4de5e3e2a001571b3 SHA1 ef4f6d41d4c54e203453ce51070277b1dccfcce0 SHA256 22bf970a86068e4685a60b2655f7cfe6042da6247516a59e758abc563cfdcbbe
+EBUILD broadcom-sta-5.10.79.10.ebuild 1024 RMD160 ce0c9873be280ac77de9e0a830c080375bb39465 SHA1 43b9cfff7af620d9ff21ab505ff11a4d0fa02e43 SHA256 ff409b5e8935f3f26030990e3ad6ac865a84931b31976e5f555fc68ad4cf4ada
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
new file mode 100644
index 0000000..4f4fd86
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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=""
+
+DEPEND=">=virtual/linux-sources-2.6.22"
+
+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"
+ epatch "${FILESDIR}/${P}-linux-2.6.29.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
new file mode 100644
index 0000000..1a7e063
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-hidden-essid.patch
@@ -0,0 +1,11 @@
+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-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch
new file mode 100644
index 0000000..9259378
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.79.10-linux-2.6.29.patch
@@ -0,0 +1,174 @@
+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);