commit: ddc55138ecddc88b3472b97235fbe3078b9b35db Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Dec 9 19:37:03 2016 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Dec 9 19:39:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc55138
net-wireless/broadcom-sta: Drop old versions. All of the upstream download links have changed, and I since I doubt anyone uses any of these old versions, throw them out instead of fixing them. net-wireless/broadcom-sta/Manifest | 7 - .../broadcom-sta-6.30.223.141-r2.ebuild | 67 ---- .../broadcom-sta-6.30.223.248-r4.ebuild | 78 ----- .../broadcom-sta-6.30.223.248-r5.ebuild | 79 ----- .../broadcom-sta-6.30.223.271-r2.ebuild | 76 ----- .../broadcom-sta-6.30.223.271-r3.ebuild | 77 ----- .../broadcom-sta-6.30.223.30-r2.ebuild | 83 ----- .../files/broadcom-sta-6.30.223.141-license.patch | 10 - .../broadcom-sta-6.30.223.141-linux-3.10.0.patch | 102 ------ .../broadcom-sta-6.30.223.141-linux-3.15.patch | 17 - .../broadcom-sta-6.30.223.141-linux-recent.patch | 126 -------- .../broadcom-sta-6.30.223.248-linux-3.17.patch | 29 -- .../broadcom-sta-6.30.223.248-linux-3.18.patch | 30 -- ...adcom-sta-6.30.223.248-r3-linux-3.15-3.18.patch | 350 --------------------- .../broadcom-sta-6.30.223.248-r3-linux-4.0.patch | 26 -- .../broadcom-sta-6.30.223.248-r4-linux-4.2.patch | 16 - .../broadcom-sta-6.30.223.271-r2-linux-4.3.patch | 12 - .../broadcom-sta-6.30.223.271-r3-linux-4.7.patch | 14 - .../broadcom-sta-6.30.223.30-linux-3.10.0.patch | 102 ------ .../broadcom-sta-6.30.223.30-linux-3.9.0.patch | 17 - .../files/broadcom-sta-6.30.223.30-makefile.patch | 14 - 21 files changed, 1332 deletions(-) diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index e39f94d..d298806 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,10 +1,3 @@ -DIST README-broadcom-sta-6.30.223.248.txt 16775 SHA256 e25eaa7e666a361abff679d7518c75200ee4d90f8e5cb16f69af3f033c68811a SHA512 e635629f0a75059fa13b2bd2a756397631bc0add43786b0064d3f0232c9bd42dae394b9631846bf602f6cea628a49928ec2344df453ec5075168736627494020 WHIRLPOOL 4b0923b276bca6c3a0f8b37c903e3cd1b3f9ea37b07ffe308b831e505c691f4b77489abd491cd2c7334fe692846fe797c7d4b0ac63e8786f4190f5c2791e6b46 DIST README-broadcom-sta-6.30.223.271.txt 16755 SHA256 4d6d63f6eb40f84359be06f1f6f26075827a0d25cdaa364d8ccb6561bf162e34 SHA512 ce277af132b656705aee3f8072d1082bfd2a1b7c63a9e330a470546437d4034e7964c64a4f9c326bf15c5f74b9c09a56d720542a41e5ae6e0d42d335488f31f5 WHIRLPOOL 3a544132315cbbc633ac6b6102d71109fea3b9e7742c299f2fe403ecc43206380051c91353c4d79033ac1939fe862b84cb8e435f06687af804fdc2ad5619beb7 -DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2 -DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_i386.deb 1732452 SHA256 d689040ac2ef67b9947f892b52764cd94c2090499747b57d63c2b40c7bc8eabb SHA512 323db5e6c8fc702990d7137bd11d2e8bba7ed073ee8da00125d147872edf90dd051a959198dbdaf92808403cdcfd582f17afb8a6f5e741382d3a0cffd6ce130a WHIRLPOOL db24f078e2639f609021028304e7caf48b9a3737b6fdf4b2522ab74606c6cb0b11a94706978b1fd1acdf66c59e351a4a433cf9e500862931a1e9dce6e5562c01 -DIST hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz 1735911 SHA256 d57c33f6bf4ebe68cac67ffe39c2260b8990bb0f07413dfd021dd4db845199a7 SHA512 adb3d9d9375888df3317d6af3d6d45c53412a677e5431051cbfe8c9eac3b13760022fd9b970e77caaeb0fa010ee8bd32ad80076d7279b60719bfb8562c09951f WHIRLPOOL f037e26d7f85d9a1bf3f2638fa6d6bbda43384e24fb249e90afcfff792be8013f1e0f2a1876c4675e39911d4e4877f0ab785eab15f7a6460621fe14c21bab486 -DIST hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz 2824762 SHA256 b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad SHA512 9f067cf5e1be562c78252791c0b2324b568c8533903842e18e92f2b10c3277e1d15ed42a5925acbd443de373f5113d05447b885a8d52ef57695babe48d68a0ff WHIRLPOOL f3bfef5b3dcbf6d051facbda0078a9850a1cf2f851bca07fd7538ffc3d5c0bf118622d217bb7737fdd87825af73b61ddd2d9a52c3d13a8070be02d1a584a8b14 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 SHA256 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b WHIRLPOOL c96c21e4d497136c4ac5a8f3f1d3e84a7b5f5478ca7c1276262481d66b919639f475b99783ad993c01c94e380275fdd6eb39dd53f224b43912f7a395cada575c -DIST hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz 1786627 SHA256 5f37b2b879e29b220dc64ce2e93d922dc231d4241da03bcbab15ced10e649b4a SHA512 a83defe4553f680b984bf49788377436c5f563f2920c129d87a3930fb6501d0f833d353acf229fa4f67b761e4564428c62bc1c8e3e23c0727d01b8c4f797f6af WHIRLPOOL d1ddc19e29a6927ae0f172613d429a92d5009515b4db1bc188b0ced41ff39565512d4f85721bcf4ddd0a951afadfd7bc303219ed93a20f83e1936a9c82717e47 -DIST hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz 2875739 SHA256 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 SHA512 ce1e9f7f52cd98eaba5cf4ec0c7276bddf3ad906a0111eb236665daca72f36139ca4a8af72658cf91b0eaaa8479e54f5bb3bce77a0cc9bc1966f044b76b8295a WHIRLPOOL 6393507f340f4244d8e40c81102e37f9df0d5dbc0ce4e0fd3ed187ddde6faf3be9bfae59371eb307d031974b5b6d1417c7c11fbdd51b9f3b168ccd83d48276d9 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 SHA256 5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17 WHIRLPOOL 8a905a35581f5c4a1177a3da7356731a360ba5c72e2897d363682afc49b73c46b031776012bba983842b894505d71e6f20f9404120b676e0b79b9ef003342e56 diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild deleted file mode 100644 index 1cc1f5f..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="http://www.broadcom.com/support/802.11/"; -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"; -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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_prepare() { - epatch "${FILESDIR}/${P}-license.patch" \ - "${FILESDIR}/${P}-makefile.patch" \ - "${FILESDIR}/${P}-linux-recent.patch" \ - "${FILESDIR}/${P}-eth-to-wlan.patch" \ - "${FILESDIR}/${P}-gcc.patch" \ - "${FILESDIR}/${P}-linux-3.15.patch" - - epatch_user -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild deleted file mode 100644 index 34689fd..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="http://www.broadcom.com/support/802.11/"; -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"; -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) - http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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 ~!BCMA ~!SSB" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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_prepare() { - epatch \ - "${FILESDIR}/${PN}-6.30.223.141-license.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-linux-3.15-3.18.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-linux-4.0.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r4-linux-4.2.patch" - - epatch_user -} - -src_install() { - linux-mod_src_install - - dodoc "${DISTDIR}/README-${P}.txt" -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r5.ebuild deleted file mode 100644 index 28098da..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="http://www.broadcom.com/support/802.11/"; -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"; -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) - http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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 ~!BCMA ~!SSB" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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_prepare() { - epatch \ - "${FILESDIR}/${PN}-6.30.223.141-license.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-linux-3.15-3.18.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-linux-4.0.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r4-linux-4.2.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" - - epatch_user -} - -src_install() { - linux-mod_src_install - - dodoc "${DISTDIR}/README-${P}.txt" -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild deleted file mode 100644 index adaeedb..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="http://www.broadcom.com/support/802.11/"; -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"; -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) - http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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 ~!BCMA ~!SSB" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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_prepare() { - epatch \ - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3.patch" - - epatch_user -} - -src_install() { - linux-mod_src_install - - dodoc "${DISTDIR}/README-${P}.txt" -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r3.ebuild deleted file mode 100644 index 6029b0c..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="http://www.broadcom.com/support/802.11/"; -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"; -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) - http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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 ~!BCMA ~!SSB" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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_prepare() { - epatch \ - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r3-linux-4.7.patch" - - epatch_user -} - -src_install() { - linux-mod_src_install - - dodoc "${DISTDIR}/README-${P}.txt" -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild deleted file mode 100644 index e5cdaf8..00000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -inherit eutils linux-info linux-mod unpacker - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="https://launchpad.net/ubuntu/+source/bcmwl http://www.broadcom.com/support/802.11/linux_sta.php"; -BASE_URI="https://launchpad.net/~albertomilone/+archive/broadcom/+files"; -BASE_NAME="bcmwl-kernel-source_${PV}%2Bbdcom-0ubuntu1%7Eppa1_" -SRC_URI="amd64? ( ${BASE_URI}/${BASE_NAME}amd64.deb ) - x86? ( ${BASE_URI}/${BASE_NAME}i386.deb )" - -LICENSE="Broadcom" -KEYWORDS="-* ~amd64 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -#S="${WORKDIR}" -S="${WORKDIR}/usr/src/bcmwl-${PV}+bdcom" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_setup() { - # 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" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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() { - local arch_suffix - if use amd64; then - arch_suffix="amd64" - else - arch_suffix="i386" - fi - unpack_deb "${BASE_NAME}${arch_suffix}.deb" -} - -src_prepare() { -# Filter the outdated patches here - EPATCH_FORCE="yes" EPATCH_EXCLUDE="0002* 0004* 0005*" EPATCH_SOURCE="${S}/patches" EPATCH_SUFFIX=patch epatch -# Makefile.patch: keep `emake install` working -# linux-3.9.0.patch: add support for kernel 3.9.0 -# linux-3.10.0.patch: add support for kernel 3.10, bug #477372 - epatch "${FILESDIR}/${P}-makefile.patch" \ - "${FILESDIR}/${P}-linux-3.9.0.patch" \ - "${FILESDIR}/${P}-linux-3.10.0.patch" - mv "${S}/lib/wlc_hybrid.o_shipped_"* "${S}/lib/wlc_hybrid.o_shipped" \ - || die "Where is the blob?" - - epatch_user -} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-license.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-license.patch deleted file mode 100644 index cd46709..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-license.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2013-09-13 14:26:42.613839899 +0200 -@@ -225,6 +225,7 @@ - - static int nompc = 0; - module_param(nompc, int, 0); -+MODULE_LICENSE("Mixed/Proprietary"); - - #ifdef quote_str - #undef quote_str diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.10.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.10.0.patch deleted file mode 100644 index c575f28..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.10.0.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naur bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c ---- bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c 2013-04-23 12:31:31.011588881 +0200 -+++ bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c 2013-05-20 18:27:18.830187333 +0200 -@@ -3229,7 +3229,12 @@ - wl_tkip_printstats(wl_info_t *wl, bool group_key) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ struct seq_file sfile; -+ struct seq_file *debug_buf = &sfile; -+#else - char debug_buf[512]; -+#endif - int idx; - if (wl->tkipmodops) { - if (group_key) { -@@ -3242,7 +3247,11 @@ - wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data); - else - return; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast"); -+#else - printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast"); -+#endif - } - #endif - } -@@ -3401,17 +3410,24 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) -+#else -+static ssize_t -+wl_proc_read (struct file *filp, char __user *buffer, size_t length, loff_t *data) -+#endif - { - wl_info_t * wl = (wl_info_t *)data; - int bcmerror, to_user; - int len; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - if (offset > 0) { - *eof = 1; - return 0; - } -+#endif - - if (!length) { - WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__)); -@@ -3424,8 +3440,13 @@ - return len; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data) -+#else -+static ssize_t -+wl_proc_write (struct file *filp, const char __user *buff, size_t length, loff_t *data) -+#endif - { - wl_info_t * wl = (wl_info_t *)data; - int from_user = 0; -@@ -3455,19 +3476,34 @@ - return length; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+static const struct file_operations wl_fops = { -+ .owner = THIS_MODULE, -+ .read = wl_proc_read, -+ .write = wl_proc_write, -+}; -+#endif -+ - static int - wl_reg_proc_entry(wl_info_t *wl) - { - char tmp[32]; - sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); -+#else -+ if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) { -+ WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp)); -+#endif - ASSERT(0); - return -1; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - wl->proc_entry->read_proc = wl_proc_read; - wl->proc_entry->write_proc = wl_proc_write; - wl->proc_entry->data = wl; -+#endif - return 0; - } - #ifdef WLOFFLD diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch deleted file mode 100644 index 5596c0e..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch +++ /dev/null @@ -1,17 +0,0 @@ -Add channel parameter to cfg80211_ibss_joined call - ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, - wl_get_assoc_ies(wl); - memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); - wl_update_bss_info(wl); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) - cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); -+#else -+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, -+ &wl->conf->channel, GFP_KERNEL); -+#endif - set_bit(WL_STATUS_CONNECTED, &wl->status); - wl->profile->active = true; - } diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-recent.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-recent.patch deleted file mode 100644 index 97a331a..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-recent.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2013-09-13 14:25:36.463020788 +0200 -@@ -910,7 +910,11 @@ - pci_set_drvdata(pdev, NULL); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - static struct pci_driver wl_pci_driver = { -+#else -+static struct pci_driver wl_pci_driver __refdata = { -+#endif - name: "wl", - probe: wl_pci_probe, - suspend: wl_suspend, -@@ -3235,7 +3239,7 @@ - void - wl_tkip_printstats(wl_info_t *wl, bool group_key) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - char debug_buf[512]; - int idx; - if (wl->tkipmodops) { -@@ -3408,6 +3412,7 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) - { -@@ -3462,19 +3467,90 @@ - return length; - } - -+#else -+ -+static int -+wl_proc_read(struct seq_file *seq, void *offset) -+{ -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, to_user; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ seq_printf(seq, "%d\n", to_user); -+ return bcmerror; -+} -+ -+static ssize_t wl_proc_write(struct file *file, const char __user *buff, -+ size_t length, loff_t *ppos) -+{ -+ struct seq_file *seq = file->private_data; -+ wl_info_t * wl = (wl_info_t *)seq->private; -+ int bcmerror, from_user = 0; -+ -+ if (length != 1) { -+ WL_ERROR(("%s: Invalid data length\n", __FUNCTION__)); -+ return -EIO; -+ } -+ -+ if (copy_from_user(&from_user, buff, 1)) { -+ WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); -+ return -EFAULT; -+ } -+ -+ if (from_user >= 0x30) -+ from_user -= 0x30; -+ -+ WL_LOCK(wl); -+ bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ if (bcmerror < 0) { -+ WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); -+ return -EIO; -+ } -+ *ppos += length; -+ return length; -+} -+ -+static int wl_proc_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, wl_proc_read, PDE_DATA(inode)); -+} -+ -+static const struct file_operations wl_proc_fops = { -+ .owner = THIS_MODULE, -+ .open = wl_proc_open, -+ .read = seq_read, -+ .write = wl_proc_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+#endif -+ - static int - wl_reg_proc_entry(wl_info_t *wl) - { - char tmp[32]; - sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); -- if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ wl->proc_entry = create_proc_entry(tmp, 0644, NULL); -+ if (wl->proc_entry) { -+ wl->proc_entry->read_proc = wl_proc_read; -+ wl->proc_entry->write_proc = wl_proc_write; -+ wl->proc_entry->data = wl; -+ } -+#else -+ wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl); -+#endif -+ if (!wl->proc_entry) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); - ASSERT(0); - return -1; - } -- wl->proc_entry->read_proc = wl_proc_read; -- wl->proc_entry->write_proc = wl_proc_write; -- wl->proc_entry->data = wl; - return 0; - } - #ifdef WLOFFLD diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch deleted file mode 100644 index 6ee0092..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5f7db08c046bd31b162a102ca868fa334a0357b9 Mon Sep 17 00:00:00 2001 -From: Michael Marineau <[email protected]> -Date: Sat, 20 Sep 2014 12:49:43 -0700 -Subject: [PATCH] linux 3.17 - -http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c835a677331495cf137a7f8a023463afd9f032f8 ---- - src/wl/sys/wl_linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index 1622127..11c4ec2 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -1308,7 +1308,11 @@ wl_alloc_linux_if(wl_if_t *wlif) - dev->priv = priv_link; - #else - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) - dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); -+#else -+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup); -+#endif - if (!dev) { - WL_ERROR(("wl%d: %s: alloc_netdev failed\n", - (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); --- -1.8.5.5 - diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch deleted file mode 100644 index 4860912..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5aae9ccfda6dfc680403b4a5ff9a36dcd5331dfd Mon Sep 17 00:00:00 2001 -From: Michael Marineau <[email protected]> -Date: Tue, 11 Nov 2014 15:17:46 -0800 -Subject: [PATCH] linux 3.18 - -http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5bc8c1f2b070bab82ed738f98ecfac725e33c57f ---- - src/wl/sys/wl_cfg80211_hybrid.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c -index 514a892..e3ebef2 100644 ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -2010,7 +2010,11 @@ static s32 wl_inform_single_bss(struct wl_cfg80211_priv *wl, struct wl_bss_info - - notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); - notify_ielen = le32_to_cpu(bi->ie_length); -- cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), -+ cbss = cfg80211_inform_bss(wiphy, channel, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) -+ CFG80211_BSS_FTYPE_UNKNOWN, -+#endif -+ (const u8 *)(bi->BSSID.octet), - 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, - (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); - --- -2.0.4 - diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-3.15-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-3.15-3.18.patch deleted file mode 100644 index 7fe6319..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-3.15-3.18.patch +++ /dev/null @@ -1,350 +0,0 @@ ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-01-22 01:43:25.378920452 +0100 -@@ -63,8 +63,13 @@ - static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_ibss_params *params); - static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) - static s32 wl_cfg80211_get_station(struct wiphy *wiphy, - struct net_device *dev, u8 *mac, struct station_info *sinfo); -+#else -+static s32 wl_cfg80211_get_station(struct wiphy *wiphy, -+ struct net_device *dev, const u8 *mac, struct station_info *sinfo); -+#endif - static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, - struct net_device *dev, bool enabled, s32 timeout); - static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, -@@ -1387,7 +1392,7 @@ - key_endian_to_host(&key); - - params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len); -- memcpy(params.key, key.data, params.key_len); -+ memcpy((char *)params.key, key.data, params.key_len); - - if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) { - return err; -@@ -1421,9 +1426,15 @@ - return err; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) - static s32 - wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, - u8 *mac, struct station_info *sinfo) -+#else -+static s32 -+wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, -+ const u8 *mac, struct station_info *sinfo) -+#endif - { - struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); - scb_val_t scb_val; -@@ -2010,9 +2021,15 @@ - - notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); - notify_ielen = le32_to_cpu(bi->ie_length); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) - cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), - 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, - (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); -+#else -+ cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), -+ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, -+ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); -+#endif - - if (unlikely(!cbss)) - return -ENOMEM; -@@ -2071,7 +2088,26 @@ - wl_get_assoc_ies(wl); - memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); - wl_update_bss_info(wl); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) -+ { -+ struct wl_bss_info *bi; -+ u16 bss_info_channel; -+ struct ieee80211_channel *channel; -+ u32 freq; -+ -+ bi = (struct wl_bss_info *)(wl->extra_buf + 4); -+ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec); -+ -+ freq = ieee80211_channel_to_frequency(bss_info_channel, -+ (bss_info_channel <= CH_MAX_2G_CHANNEL) ? -+ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); -+ -+ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq); -+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL); -+ } -+#else - cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); -+#endif - set_bit(WL_STATUS_CONNECTED, &wl->status); - wl->profile->active = true; - } -@@ -2629,7 +2665,15 @@ - - void wl_cfg80211_detach(struct net_device *ndev) - { -- struct wl_cfg80211_priv *wl = ndev_to_wl(ndev); -+ struct wl_cfg80211_priv *wl; -+ struct wireless_dev *wdev; -+ -+ wdev = ndev->ieee80211_ptr; -+ if (wdev == NULL) { -+ printk(KERN_ERR "[%s()] in ndev=%p: IEEE80211ptr=%p\n", __FUNCTION__, ndev, wdev); -+ return; -+ } -+ wl = ndev_to_wl(ndev); - - wl_deinit_cfg80211_priv(wl); - wl_free_wdev(wl); ---- a/src/wl/sys/wl_dbg.h 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_dbg.h 2015-01-22 01:43:25.379920462 +0100 -@@ -55,10 +55,12 @@ - - #define WL_NONE(args) - -+#define FORCE_TRACE_LEVEL(fmt, ...) do { printk(KERN_ERR fmt, ## __VA_ARGS__); } while (0) /* ## is GCC specific syntax to remove comma when single arg */ -+ - #ifdef BCMDBG_ERR - #define WL_ERROR(args) WL_PRINT(args) - #else --#define WL_ERROR(args) -+#define WL_ERROR(args) FORCE_TRACE_LEVEL args - #endif - #define WL_TRACE(args) - #define WL_APSTA_UPDN(args) ---- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100 -@@ -878,7 +878,7 @@ - static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume); - #endif - --static struct pci_driver wl_pci_driver = { -+static struct pci_driver wl_pci_driver __refdata = { - .name = "wl", - .probe = wl_pci_probe, - .remove = __devexit_p(wl_remove), -@@ -1270,6 +1270,7 @@ - MFREE(wl->osh, wlif->dev, sizeof(struct net_device)); - #else - free_netdev(wlif->dev); -+ wlif->dev = NULL; - #endif - } - -@@ -1307,7 +1308,12 @@ - dev->priv = priv_link; - #else - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) - dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); -+#else -+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, -+ ether_setup); -+#endif - if (!dev) { - WL_ERROR(("wl%d: %s: alloc_netdev failed\n", - (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); -@@ -1651,11 +1657,7 @@ - } - - WL_LOCK(wl); -- if (!capable(CAP_NET_ADMIN)) { -- bcmerror = BCME_EPERM; -- } else { -- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); -- } -+ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); - WL_UNLOCK(wl); - - done1: -@@ -2157,8 +2159,8 @@ - wlif = WL_DEV_IF(dev); - wl = WL_INFO(dev); - -+ skb->prev = NULL; - if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { -- skb->prev = NULL; - - TXQ_LOCK(wl); - -@@ -2455,8 +2457,10 @@ - p80211msg_t *phdr; - - len = sizeof(p80211msg_t) + oskb->len - D11_PHY_HDR_LEN; -- if ((skb = dev_alloc_skb(len)) == NULL) -+ if ((skb = dev_alloc_skb(len)) == NULL) { -+ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); - return; -+ } - - skb_put(skb, len); - phdr = (p80211msg_t*)skb->data; -@@ -2535,8 +2539,10 @@ - rtap_len = sizeof(wl_radiotap_ht_brcm_2_t); - - len = rtap_len + (oskb->len - D11_PHY_HDR_LEN); -- if ((skb = dev_alloc_skb(len)) == NULL) -+ if ((skb = dev_alloc_skb(len)) == NULL) { -+ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); - return; -+ } - - skb_put(skb, len); - -@@ -2664,8 +2670,10 @@ - len += amsdu_len; - } - -- if ((skb = dev_alloc_skb(len)) == NULL) -+ if ((skb = dev_alloc_skb(len)) == NULL) { -+ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); - return; -+ } - - skb_put(skb, len); - -@@ -2990,7 +2998,7 @@ - } - - void --wl_set_monitor(wl_info_t *wl, int val) -+wl_set_monitor(wl_info_t *wl, int val) /* public => is called by wlc_hybrid.o_shipped */ - { - const char *devname; - wl_if_t *wlif; -@@ -3224,42 +3232,75 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) -+{ -+ wl_info_t * wl = (wl_info_t *)data; - #else - static ssize_t --wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *data) --#endif -+wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) - { -- wl_info_t * wl = (wl_info_t *)data; -- int to_user; -- int len; -+ wl_info_t * wl = PDE_DATA(file_inode(filp)); -+#endif -+ int bcmerror, len; -+ int to_user = 0; -+ char tmp[8]; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - if (offset > 0) { - *eof = 1; - return 0; - } -+#else -+ if (*offp > 0) { /* for example, stop: cat /proc/brcm_monitor0 */ -+ return 0; /* 0 <=> EOF */ -+ } - #endif - -- if (!length) { -- WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__)); -- return 0; -- } - WL_LOCK(wl); -- wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); -- len = sprintf(buffer, "%d\n", to_user); -- WL_UNLOCK(wl); -- return len; -+ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); -+ WL_UNLOCK(wl); -+ -+ if (bcmerror != BCME_OK) { -+ WL_ERROR(("%s: GET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); -+ return -EIO; -+ } -+ -+ len = snprintf(tmp, ARRAY_SIZE(tmp), "%d\n", to_user); -+ tmp[ARRAY_SIZE(tmp) - 1] = '\0'; -+ if (len >= ARRAY_SIZE(tmp)) { -+ printk(KERN_ERR "%s:%d [%s()] output would be truncated (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); -+ return -ERANGE; -+ } -+ else if (len < 0) { -+ printk(KERN_ERR "%s:%d [%s()] unable to convert value (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); -+ return len; -+ } -+ if (length < len) { -+ printk(KERN_ERR "%s:%d [%s()] user buffer is too small (at least=%d ; user=%d)!", __FILE__, __LINE__, __FUNCTION__, len, (int)length); -+ return -EMSGSIZE; -+ } -+ if (copy_to_user(buffer, tmp, len) != 0) { -+ printk(KERN_ERR "%s:%d [%s()] unable to copy data!", __FILE__, __LINE__, __FUNCTION__); -+ return -EFAULT; -+ } -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ *offp += len; -+#endif -+ -+ return len; - } - - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data) -+{ -+ wl_info_t * wl = (wl_info_t *)data; - #else - static ssize_t --wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *data) --#endif -+wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) - { -- wl_info_t * wl = (wl_info_t *)data; -+ wl_info_t * wl = PDE_DATA(file_inode(filp)); -+#endif - int from_user = 0; - int bcmerror; - -@@ -3270,7 +3311,11 @@ - } - if (copy_from_user(&from_user, buff, 1)) { - WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); -- return -EIO; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ return -EIO; -+#else -+ return -EFAULT; -+#endif - } - - if (from_user >= 0x30) -@@ -3280,10 +3325,15 @@ - bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); - WL_UNLOCK(wl); - -- if (bcmerror < 0) { -+ if (bcmerror != BCME_OK) { - WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); - return -EIO; - } -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) && 0 /* no need to update offset because this file should only trigger action... */ -+ *offp += length; -+#endif -+ - return length; - } - -@@ -3304,8 +3354,8 @@ - if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); - #else -- if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) { -- WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp)); -+ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) { -+ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp)); - #endif - ASSERT(0); - return -1; diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-4.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-4.0.patch deleted file mode 100644 index 6d18c19..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-4.0.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/wl/sys/wl_cfg80211_hybrid.c.orig 2015-04-27 11:08:10.252439465 +0000 -+++ src/wl/sys/wl_cfg80211_hybrid.c 2015-04-27 11:10:52.454433122 +0000 -@@ -1441,7 +1441,11 @@ wl_cfg80211_get_station(struct wiphy *wi - WL_DBG(("Could not get rate (%d)\n", err)); - } else { - rate = dtoh32(rate); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) - sinfo->filled |= STATION_INFO_TX_BITRATE; -+#else -+ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); -+#endif - sinfo->txrate.legacy = rate * 5; - WL_DBG(("Rate %d Mbps\n", (rate / 2))); - } -@@ -1454,7 +1458,11 @@ wl_cfg80211_get_station(struct wiphy *wi - return err; - } - rssi = dtoh32(scb_val.val); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) - sinfo->filled |= STATION_INFO_SIGNAL; -+#else -+ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); -+#endif - sinfo->signal = rssi; - WL_DBG(("RSSI %d dBm\n", rssi)); - } diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch deleted file mode 100644 index 9e9f8a1..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c -index ea0726f..1541dad 100644 ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, - } - else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) || - event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL); -+#else - cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL); -+#endif - clear_bit(WL_STATUS_CONNECTED, &wl->status); - wl_link_down(wl); - wl_init_prof(wl->profile); diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch deleted file mode 100644 index 7869dbf..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/src/shared/linux_osl.c b/src/shared/linux_osl.c ---- a/src/shared/linux_osl.c 2015-11-26 12:16:23.343091098 -0800 -+++ b/src/shared/linux_osl.c 2015-11-26 12:17:08.657092739 -0800 -@@ -932,7 +932,7 @@ - uint cycles; - - #if defined(__i386__) -- rdtscl(cycles); -+ cycles = (u32)native_read_tsc(); - #else - cycles = 0; - #endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r3-linux-4.7.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r3-linux-4.7.patch deleted file mode 100644 index 55b30e3..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r3-linux-4.7.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-08-20 17:19:11.285578121 +0200 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-08-20 17:20:55.611574041 +0200 -@@ -49,6 +49,11 @@ - u32 wl_dbg_level = WL_DBG_ERR; - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ -+#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ -+#endif -+ - static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, u32 *flags, struct vif_params *params); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch deleted file mode 100644 index c575f28..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naur bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c ---- bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c 2013-04-23 12:31:31.011588881 +0200 -+++ bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c 2013-05-20 18:27:18.830187333 +0200 -@@ -3229,7 +3229,12 @@ - wl_tkip_printstats(wl_info_t *wl, bool group_key) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ struct seq_file sfile; -+ struct seq_file *debug_buf = &sfile; -+#else - char debug_buf[512]; -+#endif - int idx; - if (wl->tkipmodops) { - if (group_key) { -@@ -3242,7 +3247,11 @@ - wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data); - else - return; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast"); -+#else - printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast"); -+#endif - } - #endif - } -@@ -3401,17 +3410,24 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) -+#else -+static ssize_t -+wl_proc_read (struct file *filp, char __user *buffer, size_t length, loff_t *data) -+#endif - { - wl_info_t * wl = (wl_info_t *)data; - int bcmerror, to_user; - int len; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - if (offset > 0) { - *eof = 1; - return 0; - } -+#endif - - if (!length) { - WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__)); -@@ -3424,8 +3440,13 @@ - return len; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - static int - wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data) -+#else -+static ssize_t -+wl_proc_write (struct file *filp, const char __user *buff, size_t length, loff_t *data) -+#endif - { - wl_info_t * wl = (wl_info_t *)data; - int from_user = 0; -@@ -3455,19 +3476,34 @@ - return length; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+static const struct file_operations wl_fops = { -+ .owner = THIS_MODULE, -+ .read = wl_proc_read, -+ .write = wl_proc_write, -+}; -+#endif -+ - static int - wl_reg_proc_entry(wl_info_t *wl) - { - char tmp[32]; - sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { - WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); -+#else -+ if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) { -+ WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp)); -+#endif - ASSERT(0); - return -1; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - wl->proc_entry->read_proc = wl_proc_read; - wl->proc_entry->write_proc = wl_proc_write; - wl->proc_entry->data = wl; -+#endif - return 0; - } - #ifdef WLOFFLD diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.9.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.9.0.patch deleted file mode 100644 index a6e3d3d..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.9.0.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src.orig/wl/sys/wl_cfg80211_hybrid.c -+++ src/wl/sys/wl_cfg80211_hybrid.c -@@ -2013,8 +2013,12 @@ - ie_len = (size_t)(ies->len); - rcu_read_unlock(); - #endif -- cfg80211_put_bss(bss); -- } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -+ cfg80211_put_bss(bss); -+#else -+ cfg80211_put_bss(wl_to_wiphy(wl), bss); -+#endif -+ } - - tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); - if (tim) { diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-makefile.patch deleted file mode 100644 index 09c495d..00000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.old 2013-04-28 22:42:59.000000000 +0200 -+++ Makefile 2013-04-28 22:45:53.000000000 +0200 -@@ -128,9 +128,9 @@ - - EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped - --KBASE ?= /lib/modules/`uname -r` -+KBASE ?= /lib/modules/${KV_FULL} - KBUILD_DIR ?= $(KBASE)/build --MDEST_DIR ?= $(KBASE)/kernel/drivers/net/wireless -+MDEST_DIR ?= ${D}$(KBASE)/kernel/drivers/net/wireless - - all: - KBUILD_NOPEDANTIC=1 make -C $(KBUILD_DIR) M=`pwd`
