diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-05-05 17:25:29 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-05-05 17:25:29 +0000 |
| commit | 8f397606bde1ffc4b2b52af3213780b97104e364 (patch) | |
| tree | bd6090155f19e715a75d70b7b8faac58d01b55c9 /net-wireless | |
| parent | Version Bump (diff) | |
| download | gentoo-2-8f397606bde1ffc4b2b52af3213780b97104e364.tar.gz gentoo-2-8f397606bde1ffc4b2b52af3213780b97104e364.tar.bz2 gentoo-2-8f397606bde1ffc4b2b52af3213780b97104e364.zip | |
Add patch for linux version 4.0. Add myself as co-maintainer. Update ebuild to apply patch. Thanks to Mike Marineau. ( Bug #544138 ).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B576E4E3)
Diffstat (limited to 'net-wireless')
4 files changed, 40 insertions, 3 deletions
diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog index 328e8ce76341..b5f9f5088964 100644 --- a/net-wireless/broadcom-sta/ChangeLog +++ b/net-wireless/broadcom-sta/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-wireless/broadcom-sta # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.64 2015/01/27 19:40:43 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.65 2015/05/05 17:25:29 mpagano Exp $ + + 05 May 2015; Mike Pagano <mpagano@gentoo.org> + broadcom-sta-6.30.223.248-r3.ebuild, + +files/broadcom-sta-6.30.223.248-r3-linux-4.0.patch, metadata.xml: + Add patch for linux version 4.0. Add myself as co-maintainer. Update ebuild + to apply patch. Thanks to Mike Marineau. ( Bug #544138 ). *broadcom-sta-6.30.223.248-r3 (27 Jan 2015) diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild index 30e35d5defc8..628a4301005d 100644 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild,v 1.1 2015/01/27 19:40:43 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r3.ebuild,v 1.2 2015/05/05 17:25:29 mpagano Exp $ EAPI=5 inherit eutils linux-info linux-mod @@ -64,7 +64,8 @@ src_prepare() { "${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-3.15-3.18.patch" \ + "${FILESDIR}/${PN}-6.30.223.248-r3-linux-4.0.patch" epatch_user } 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 new file mode 100644 index 000000000000..6d18c19bd430 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-linux-4.0.patch @@ -0,0 +1,26 @@ +--- 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/metadata.xml b/net-wireless/broadcom-sta/metadata.xml index 4f3291ab14f7..86fb9940ef8e 100644 --- a/net-wireless/broadcom-sta/metadata.xml +++ b/net-wireless/broadcom-sta/metadata.xml @@ -5,5 +5,9 @@ <email>mattst88@gentoo.org</email> <name>Matt Turner</name> </maintainer> +<maintainer> + <email>mpagano@gentoo.org</email> + <name>Mike Pagano</name> +</maintainer> </pkgmetadata> |