Version bumped, bug #388547.
authorMatsuu Takuto <matsuu@gentoo.org>
Wed, 26 Oct 2011 23:32:28 +0000 (23:32 +0000)
committerMatsuu Takuto <matsuu@gentoo.org>
Wed, 26 Oct 2011 23:32:28 +0000 (23:32 +0000)
Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

net-wireless/broadcom-sta/ChangeLog
net-wireless/broadcom-sta/Manifest
net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild
net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild [moved from net-wireless/broadcom-sta/broadcom-sta-5.100.82.38.ebuild with 73% similarity]
net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch [deleted file]
net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch [deleted file]
net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch [deleted file]
net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch [deleted file]
net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch [deleted file]

index c093f2e0023eb6abac02f7156f07880ce374074d..f93a68d36021e97fb827e3cbd3159bfc2edb64dc 100644 (file)
@@ -1,6 +1,18 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.39 2011/10/25 14:00:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.40 2011/10/26 23:32:27 matsuu Exp $
+
+*broadcom-sta-5.100.82.112 (26 Oct 2011)
+
+  26 Oct 2011; MATSUU Takuto <matsuu@gentoo.org>
+  -files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch,
+  -files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch,
+  -files/broadcom-sta-5.60.48.36-linux-2.6.35.patch,
+  -files/broadcom-sta-5.60.246.2-gcc.patch,
+  -files/broadcom-sta-5.60.246.2-linux-2.6.34.patch,
+  -broadcom-sta-5.100.82.38.ebuild, broadcom-sta-5.100.82.38-r1.ebuild,
+  broadcom-sta-5.100.82.111.ebuild, +broadcom-sta-5.100.82.112.ebuild:
+  Version bumped, bug #388547.
 
   25 Oct 2011; MATSUU Takuto <matsuu@gentoo.org>
   broadcom-sta-5.100.82.111.ebuild:
index c491627dcb67c1cfefc2829c4be035964fcf0981..dba82755442c4f1392c96861931b2244d9a7ee0f 100644 (file)
@@ -2,37 +2,34 @@
 Hash: SHA1
 
 AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c3864f6a352883e0 SHA1 0f2458882656dbf73035e566e53b902bc22c37f4 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1
-AUX broadcom-sta-5.10.91.9.3-linux-2.6.32.patch 576 RMD160 17d1f0e2ea7e507bc7c7522f7dee8d667c04c131 SHA1 3b13b5d10b199da0590f7b9fed6694e23369596d SHA256 55ef2c1f7be8414b2df89d9f118affa9650c94e95491ad7f9c112f06debdf5d6
-AUX broadcom-sta-5.10.91.9.3-linux-2.6.33.patch 551 RMD160 2e0385d005127de53d040df3a079a6facff6eb2e SHA1 3aad38866d5e5239f0b12c891db4372d679ed57b SHA256 08b2b9e401118be918e02634707120cf926677e7ae6fabc69158eb8b7a8cbfb2
 AUX broadcom-sta-5.100.82.111-linux-3.0.patch 935 RMD160 a41d650fe6fa49906380b9223753c09251260478 SHA1 cda888b879c8c9386650c05dde358925160c4281 SHA256 cd349fef72bb33025e59105fefa69c3e60066985707f396e03235102ca938137
 AUX broadcom-sta-5.100.82.38-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
 AUX broadcom-sta-5.100.82.38-linux-2.6.37.patch 530 RMD160 e8f4612fc6d48d32603a7168a07dd62713e90614 SHA1 bc044b663f69f8eb8886a5886213031212be144c SHA256 a1b75ee09bb2a372a5d35c0309042abc6b47cfbaf18a413e5171926696f882e8
-AUX broadcom-sta-5.60.246.2-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
-AUX broadcom-sta-5.60.246.2-linux-2.6.34.patch 889 RMD160 c3ac4c5e5a4511c2a6774180c90041d4809ecd80 SHA1 e19d3bf4734882053ab273db5c3babfb814463d9 SHA256 e8ce64fee738e1aeae08320b788d2e6547d5efcbfc0833c2eb129f8eee0da3d2
-AUX broadcom-sta-5.60.48.36-linux-2.6.35.patch 1670 RMD160 66ed871880630e65e509af96586646589b8f0c08 SHA1 6173cb1442ba0cda520082bdb79ba7089b2e4538 SHA256 4ec98dc9395c117d5dbe0f0cb5ce2add82f2cf1892c833d79689889596b5152e
 DIST hybrid-portsrc_x86_32-v5_100_82_111.tar.gz 1138574 RMD160 9678c12779802ef92098de518b2d5db2e0c03972 SHA1 af23f31679973a1bcacea79b65d10dbe231f8862 SHA256 30aae0c44260dacb2cbddf9f3669bc0de484516c80322628b56367cde436b0b8
+DIST hybrid-portsrc_x86_32-v5_100_82_112.tar.gz 1139221 RMD160 22ea29e56a27accc82fccd3588cc1cdaef1ccece SHA1 01aa32f9e85621253a3f15cf4361bb80d41da3e8 SHA256 85b4e3163b383943d5002a571efbd03f212d010ba0962ebdefb201fe6ce270e7
 DIST hybrid-portsrc_x86_32-v5_100_82_38.tar.gz 1195817 RMD160 020c3b76aa50e1f911288b28e656a0524620311a SHA1 3062830f86c5f1f41d8a4b26d6e0072dc989c7ba SHA256 f736af1da2fa05fb65d8e919b3eb0116eb5ef47e4acc14f5a2adc4bac1b4fb37
 DIST hybrid-portsrc_x86_64-v5_100_82_111.tar.gz 1407430 RMD160 20dde858a21e96a2f105534916fa4b852b18e952 SHA1 8028950609631106c7844bb039a29f78e92baae7 SHA256 e8340c500be8e52b58479286c28a84eb6c6fc22d4f49ae27d257e2efb01b84bf
+DIST hybrid-portsrc_x86_64-v5_100_82_112.tar.gz 1175410 RMD160 2c52f8edd27c119dd7e802f065398bacd32ed754 SHA1 5bd78c20324e6a4aa9f3fafdc6f0155e884d5131 SHA256 9cd32f164c748b4353f10a74f3b00640bb281e4b79f17114aac581e0b3cd4ae3
 DIST hybrid-portsrc_x86_64-v5_100_82_38.tar.gz 1150253 RMD160 5f1937e997446de015c49f1ced1bc7864cb07791 SHA1 6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735 SHA256 1c165b26a9d736d07c0912577134414d8742242521f313e3830afb44524d35a7
-EBUILD broadcom-sta-5.100.82.111.ebuild 1683 RMD160 e817ce10d39252620d910efb2e38d380a13fa6cf SHA1 747689038349662966b03cc0bc6a5ddeff883c42 SHA256 7720e0236488422a74690c933ceb770b4fbe7b9ac92da4eee79359363c92c4be
-EBUILD broadcom-sta-5.100.82.38-r1.ebuild 1926 RMD160 12b4ee60e945a9820e3620406abc1f7e66cee7e8 SHA1 021cc8c5733169ef60458368aac9877733bda8a3 SHA256 3628b0161db5ae0cf702e3502b44e90f40c19f1d8be1243d837e8bc6f07f76ac
-EBUILD broadcom-sta-5.100.82.38.ebuild 1907 RMD160 c6c32daa1f09559b694723c5f1e96959d30864d9 SHA1 63903d97276ea45d30e1406544be77377ded38d1 SHA256 bfbec5bc3258f9759a04d2e4f4a7c798ae78757a1b9aea24edd45f72aff3410b
-MISC ChangeLog 9240 RMD160 86e8ae7514d560ac1b3e218b48d1674c4ffcbc3a SHA1 f482160f34945e40c05bd8b6876b8cfb601ad815 SHA256 a105fa78bd212a0b067fd9a296a0ee40b10d06cf7985087b23b2fcc9b294569f
+EBUILD broadcom-sta-5.100.82.111.ebuild 1682 RMD160 9ba74f5a0b7cc4565f39f361054e96a8a75dced0 SHA1 317e4431768114b4450288952345e57c6991438b SHA256 dcc978aa10eb88b93a342ed3ad56bea43934284c8d04e11f406b548b4d8df08a
+EBUILD broadcom-sta-5.100.82.112.ebuild 1683 RMD160 f95e56c44b88de8141501fc10109731712c8a1af SHA1 4dabb62b8ee2795c0187eea5fb53925a5149a61f SHA256 ab8ae08de534ba9e1a57810d8941209933710ebb3b1ea005597a14f32a90002f
+EBUILD broadcom-sta-5.100.82.38-r1.ebuild 1925 RMD160 10110837100d47057274423b3377430b94e4d760 SHA1 c54b59c75061b44e8ae1e4287f760e3a538592a6 SHA256 ffd42c04a83a8a917efdfcb12c3ce1c9c057f68c5868c5d6391d8c5a686734a6
+MISC ChangeLog 9764 RMD160 c855304d762446bee5474495c79ce41647e8eeb3 SHA1 c6f6243cea33de0e6df47cf783a08abbde69c6b5 SHA256 61c970bfa204de6fefd3c5496303e6562f55c76c6ee65467366f4583138ac1d2
 MISC metadata.xml 200 RMD160 397a9fbaf0e2d458f8d95d2415a47a671d5dda58 SHA1 714cb7b31fb311633bb0cc8ca2f24155891e342d SHA256 bb8d57cfa8edd3743459c30d264cc37cc5e20d71dca61651939a965274f23b20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOpsEFAAoJECaGw+YFKA1pHcQP/RZCvV9gTW1NmVdyGtJ1PgP2
-zJnPRlTxwmZ+htXCAXL3HNAAffEufe8GJ8bnRBQGEcmsiDTDUUNGypNt5UHFEGIl
-cOu3gN6apvqRxB3n0ks4xUm/rt+hTHSzoMlVhye+FpL+DrSfC6/Bpd4ADtGW4sqO
-lvsjLF0z8U72fcCUjuKuEQPJbzXaAMyxBbMVaROBXlCDGZB5GmxDKDb1j+aofmBk
-HpSLDDtnrKhXPWN4zZUg8Uix4VL5eCbIrFeDKBh7GT8+A+Jh/M4fbjDZSmR0qjpm
-egc994YNdTtqh4MthjlIgjx8fMXZY+3OQmwpbOx2DXKjJQzkihm1+Mz4dauri7oz
-TasqnhqsXRMmhGPhCNgVbOaXoq9iY01wpPqeqSkcl+3EOhUbCjVXll0sMiTni3KE
-z3/SozqFsDcBU/2oYM8+eIlBmGm4yTZ7SwoC/zekH+rdYlA1rl+aO4s5PSLzrBiV
-5Jrm543PKn+fuVgSxtRTtwaTl0lxkH9SSKMgJW8YIPQFh3so6OLgKrE0Fn3pWH6p
-jHCJcrVLA1Bz+r8WktGqpVEwdHu62nvSmThX2SXJZKRNwBlPuCC2pJ6Gr98lPaKv
-eNqw6BeuKm1FEslzpPBsTT0mhvVp+w3mLjU4JlkvKZjN1WI2FLtja2fnrZFeV+gH
-zol147s7/iDYHBXlIwyY
-=1cHf
+iQIcBAEBAgAGBQJOqJiRAAoJECaGw+YFKA1pKQwP/1CUc6VgTduxtb0hloZNVfZ+
+65w8jrj+yi8F615UBqbxrb6XT4TePLqS2PgInh7VTS+PsfMQ6KsR4DBbVi2pgbVq
+cdAivOlbO5IKLXMC15CVqfjsn04FLTC8lk3CVd0J6pXHMBLya68ZtaBVQxQGEO6r
+Fx8oGSy0VkcPvWcQtv4d+cSbS6PGVABahqwvub8fc8eFYhw07TaNgmcLktuoykGG
+G0SQ/e0oJziZGMOD1Qvv3f47aDUbFYLCJzejiLLGfdleyq78hIZvYHfW0suefkc5
+5x2obYn5MOteHugej7SMu5yDsD9c3ZwFBrH+NvNoI/7hINtWK8moQYkZiZUZUkHE
+sTTgxNRwZKm6jA9nlipOmlLtei9W6bvB0BG5c82AwjpIyBgsKoSGKTMVZiELqxcp
+YhOhWWuRLFQyWtgDTZhaD593BNsRQZ6XuDyC6FVYmVZDYtguJnpmb/VLy23d2ucz
+y5n59bR4yvIwxBYRcRLgIvoCPc+XqWiC5S9TxznedtCoMVX9oUxXWh/ofweAMpxS
+VgyW+y1I7CfcU475PWeHbudwcjIBlip8MDaRlgPEKG6s1T5wfQeA0UovuZSIe0bH
+HisoLJGdntmBmX5np6R5RO2i9BMbKuSwzki7holhr8732+xoa0dKWd4fClOayeiF
+T0Fzi5lNh5GXUH1TqeQ1
+=kpK9
 -----END PGP SIGNATURE-----
index 5edec6342fbb524083d906291702001f906768f0..41c99e73c958bf06fffd2b239a76f45835db134a 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.100.82.111.ebuild,v 1.2 2011/10/25 14:00:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild,v 1.3 2011/10/26 23:32:27 matsuu Exp $
 
 EAPI="2"
 inherit eutils linux-mod
@@ -15,7 +15,7 @@ LICENSE="Broadcom"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT="mirror"
+RESTRICT="fetch"
 
 DEPEND="virtual/linux-sources"
 RDEPEND=""
similarity index 73%
rename from net-wireless/broadcom-sta/broadcom-sta-5.100.82.38.ebuild
rename to net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild
index 3b5b6964c3c2efeac2b35c4616e10a62bf383a69..8ead820d3a72b5bfe1491781abd7304e924df67a 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.100.82.38.ebuild,v 1.4 2011/04/28 18:57:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild,v 1.1 2011/10/26 23:32:27 matsuu Exp $
 
 EAPI="2"
 inherit eutils linux-mod
@@ -12,7 +12,7 @@ SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
        amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
 
 LICENSE="Broadcom"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT="mirror"
@@ -25,19 +25,14 @@ S="${WORKDIR}"
 MODULE_NAMES="wl(net/wireless)"
 MODULESD_WL_ALIASES=("wlan0 wl")
 
-PROPERTIES="interactive"
-
 pkg_setup() {
-       check_license
-
        # bug #300570
        # NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
        # make checks non-fatal. The correct fix is blackisting ssb and, perhaps
        # b43 via udev rules. Moreover, previous fix broke binpkgs support.
        CONFIG_CHECK="~!B43 ~!SSB"
-       if kernel_is ge 2 6 33; then
-               CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211"
-               ERROR_WEXT_PRIV="Starting with 2.6.33, it is not possible to set WEXT_PRIV directly. We recommend to set another symbol selecting WEXT_PRIV, for example, PRISM54, IPW2200 and so on. See Bug #248450 comment#98."
+       if kernel_is ge 2 6 32; then
+               CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!MAC80211"
        elif kernel_is ge 2 6 31; then
                CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
        elif kernel_is ge 2 6 29; then
@@ -53,5 +48,6 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-               "${FILESDIR}/${PN}-5.100.82.38-gcc.patch"
+               "${FILESDIR}/${PN}-5.100.82.38-gcc.patch" \
+               "${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch"
 }
index e355403dc0ed3832d653c32f7a89b6b50bd33fa1..aff9488fb81f9a9339869cf65c55f4ad5c82797e 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.100.82.38-r1.ebuild,v 1.5 2011/07/13 19:42:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild,v 1.6 2011/10/26 23:32:27 matsuu Exp $
 
 EAPI="2"
 inherit eutils linux-mod
@@ -15,7 +15,7 @@ LICENSE="Broadcom"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RESTRICT="mirror"
+RESTRICT="fetch"
 
 DEPEND="virtual/linux-sources"
 RDEPEND=""
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
deleted file mode 100644 (file)
index 956cb5c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch
deleted file mode 100644 (file)
index 54b1141..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h broadcom-sta-5.10.91.9.3/src/include/linuxver.h
---- broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h       2009-09-16 07:25:27.000000000 +0900
-+++ broadcom-sta-5.10.91.9.3/src/include/linuxver.h    2010-01-16 08:20:12.000000000 +0900
-@@ -19,6 +19,8 @@
- #include <linux/version.h>
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
- #include <linux/config.h>
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33))
-+#include <generated/autoconf.h>
- #else
- #include <linux/autoconf.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
deleted file mode 100644 (file)
index 0485653..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h   2010-10-08 07:32:59.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h 2010-10-28 00:50:57.925351964 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
- #include <typedefs.h>
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
deleted file mode 100644 (file)
index 9ac6b9e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c
---- broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c 2010-10-01 03:53:22.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c      2010-10-30 15:29:48.000000000 +0900
-@@ -1415,7 +1415,7 @@
- static void
- _wl_set_multicast_list(struct net_device *dev)
- {
--#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
-       struct dev_mc_list *mclist;
- #else
-       struct netdev_hw_addr   *ha;
-@@ -1435,7 +1435,7 @@
-       if (wl->pub->up) {
-               wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
--#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
-               for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
-                       i++, mclist = mclist->next) {
-                       if (i >= MAXMULTILIST) {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
deleted file mode 100644 (file)
index a31ba97..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h    2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h 2010-06-05 09:32:46.000000000 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
- #include <typedefs.h>
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c 2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c      2010-06-04 08:25:22.000000000 +0900
-@@ -1416,8 +1416,13 @@
- _wl_set_multicast_list(struct net_device *dev)
- {
-       wl_info_t *wl;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+      struct netdev_hw_addr *ha;
-+      int i=0;
-+#else
-       struct dev_mc_list *mclist;
-       int i;
-+#endif
-       if (!dev)
-               return;
-@@ -1430,14 +1435,22 @@
-       if (wl->pub->up) {
-               wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+              netdev_for_each_mc_addr(ha, dev) {
-+#else
-               for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
-                       i++, mclist = mclist->next) {
-+#endif
-                       if (i >= MAXMULTILIST) {
-                               wl->pub->allmulti = TRUE;
-                               i = 0;
-                               break;
-                       }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+                      wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
-+#else
-                       wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
-+#endif
-               }
-               wl->pub->nmulticast = i;
-               wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));