diff options
author | 2019-07-19 09:58:18 +0200 | |
---|---|---|
committer | 2019-07-19 09:58:18 +0200 | |
commit | c42319973b2ca82a848d1e18ac13ae5058167608 (patch) | |
tree | 1ef503a70bf497a6d4071bb7c8eeac63e5ebe733 | |
parent | gnome-base/dconf: Correct name for D-Bus patch (diff) | |
download | ennui-c42319973b2ca82a848d1e18ac13ae5058167608.tar.gz ennui-c42319973b2ca82a848d1e18ac13ae5058167608.tar.bz2 ennui-c42319973b2ca82a848d1e18ac13ae5058167608.zip |
net-wireless/broadcom-sta: patch for removed get_ds() function from Linux 5.1+
Signed-off-by: Nicholas Fish <gentoo@seaofdirac.net>
15 files changed, 574 insertions, 0 deletions
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest new file mode 100644 index 0000000..da39c20 --- /dev/null +++ b/net-wireless/broadcom-sta/Manifest @@ -0,0 +1,17 @@ +AUX broadcom-sta-6.30.223.141-eth-to-wlan.patch 395 BLAKE2B 80ee748c37774a85b5591601c81beca81ae2924a63bb76fbaa5914e9d2ff6344765ca1de334ae39af8f7e027af2da859512f4110d0b334e6b18d713186d20817 SHA512 1b340746e47edcc63cacf454fc44cd40ac34e526dacb026602e629b16030eeab0919456cadad7f93662291c1a0bea461c25471a7b71b7e9a1103f88e7d92be5d +AUX broadcom-sta-6.30.223.141-gcc.patch 316 BLAKE2B 862f4c5a2284d5e2adb6d76c803d7fafe242ed3b69f526237ad231641c1160890ccbc4a8d2bc3e474176195d1bba6c68352afb47bcd619539b5b90fbbd8739e5 SHA512 a298ff51359da6fd5f47ca63e99babc778a95622687c205cca4244d16552fc697f46f90cadc93fc8e8d6674965b3641a0d22d35c5f14d6d86cf3215a71db6172 +AUX broadcom-sta-6.30.223.141-makefile.patch 497 BLAKE2B 17cf5baf3214ac5d75ad2918c74861b36e0ba56d757a2c5edb30599fa98be54b8fb7bdaf14b4339a0e6fbc748316c59a51319f8196454318b34fe85dec9aeba6 SHA512 f403669dede71f3c9f2886bfa535518a9e89a4398d1da7789ff955f15c493dd5ede1f304b0980c300c580ac1ae2464a4e395fb40b72dffa98a5a015c3e7d74c5 +AUX broadcom-sta-6.30.223.248-r3-Wno-date-time.patch 380 BLAKE2B d0398b0d856a1abb34e42f1ad2d1cfcf4c6203a82c251a40562c15ba46b1c8cd0a6cc1bedcdf576e02cc671b56f1f2da826dd0781df0308f7c8fac8387413293 SHA512 f1f96ac2b51be18bfdc4c3d627801cb14d024def92416434c3c0a9adb986e846f9ceb6087b5ab343d78ed87a3dda277818cb060534b44be62bf8f123bc6594fd +AUX broadcom-sta-6.30.223.271-r1-linux-3.18.patch 326 BLAKE2B 9c7069c310983625ff1c8a956ea2e856e24c429791197b3e7e1131189fbf9e4b44e3e33cad672ffec44017779300bae3462b175399b1b4dcc2481f1f7b429d45 SHA512 bdc7f810bf01446e9752e664030e570396127a674b397ecd0001a0ff79103a891e5011975a819d3decfb8cc4dc90e7655621753c76ccc07bde99a2610f188587 +AUX broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch 408 BLAKE2B f7a01e470641b7a19cb649ceafe9c37d882dc2271fdec0e027919a8d3ed119663480a7eed645116b20b72f90cd96acc8c9e49afc570404ba51a36ef3697ca9c5 SHA512 d419d776bb8a0071250eb26d1e878639df35272dc47a8eb459f426356fadb0ab25779a90dd1317711c94549ec45f80b70fca9677c93c37cac829913120cc80d4 +AUX broadcom-sta-6.30.223.271-r4-linux-4.11.patch 1588 BLAKE2B 4212e27fa627da17bb46ddabb278ecf927d90263a8a3e44253663ee5171b38d854e07d4ca3372a412cb8fee0c21d04db18fa870cd6a2f5432376ac20694c801d SHA512 c134b34dcb4221f59de6cc9afcfb47c459ee840189c4b317f9440df3dab0c3fdf5a8798850c7335fbc05c904c9b224e6bc0457f2d33b04bef550c2d92a92cf20 +AUX broadcom-sta-6.30.223.271-r4-linux-4.12.patch 2320 BLAKE2B 9595273b57d76585f6cf7179342979911e5cfd0bc77eda1c1c5d90751c51dad8f8eb3d5c836a2618327e4b9fcae31908aad1f920c58de5c2cf9aa70e3d8e0f2d SHA512 4eecf21bf95943150db8f7bc0a3bd4634050095cc6b2a91164590e3d0887fd37d4425b27537cb63e2ece26596b85eb1f0aef52624a390015a61868d7d807dd2b +AUX broadcom-sta-6.30.223.271-r4-linux-4.15.patch 1343 BLAKE2B ca87ae817cefd6436da9ba827c2aa83fec0b7b1e0d837842d857fdba0ba88b52cfd8eec0beddfdb67f08870d6bc2f8f3d3d0bc0fdeeab8fe849eb704dfd8f8a2 SHA512 5558ee1b82f62250e64e3fe71b340698d48325f43bb774be00dc3557c3789b7180282082905e21cf97316b70fd6de5941521db198dd2b6396903ab31465f336b +AUX broadcom-sta-6.30.223.271-r4-linux-4.7.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f +AUX broadcom-sta-6.30.223.271-r4-linux-4.8.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578 +AUX broadcom-sta-6.30.223.271-r4-linux-5.1.patch 705 BLAKE2B 3c80307753ede2bdda21f974a5404231fe23829e862445aabdf168b2fb4fd44c153812a156297cc5fe77299bbf79c1a5a984a1f76308185167a58ff1afc2249f SHA512 ff6435ac1853d504e8a1df19026edba1475d53ae63636573a0f3703ef03aedfff78a2b5cc30283cbae188504212cf54b9e9d13e8dbee3ffc0ef9ce2f56207af8 +DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663 +DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b +DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17 +EBUILD broadcom-sta-6.30.223.271-r4.ebuild 3818 BLAKE2B 47ff1c12b3dd661fdca25af9235a715e0ca5586762538b6c89a5aae2d7ca911e1f93cd3aed935623429bfc83efaa1100981b0f84dca356d56a74c348ffa58646 SHA512 50b1f7ec43fbd3a7bebbad0ff5ca80d8e326e2492b09dbac7a5c940fcf12a3cee142c2c4acfb442d8a0baf331b41da12ffa3993b04d94f8a792597654a70c890 +MISC metadata.xml 333 BLAKE2B 0634d9cb768f942e912418540c980cfb5027423f9bde64faaa8ad0179a798fe98b0d93c3a5d259c74609acc213ddcd73addd3799671e5215cf636dd9d4429f45 SHA512 d792d7293edec312c9da7f4db8162cb415bfee561302d7523b3398132c31cd4dcf638e0c815c0046dea81b7de2642d31407b38a8612e04090e0f3ed608b202df diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild new file mode 100644 index 0000000..d2eff60 --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils linux-info linux-mod + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" +HOMEPAGE="https://www.broadcom.com/support/802.11" +SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35" +SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) + amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) + https://docs.broadcom.com/docs-and-downloads/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_pretend() { + ewarn + ewarn "If you are stuck using this unmaintained driver (likely in a MacBook)," + ewarn "you may be interested to know that a newer compatible wireless card" + ewarn "is supported by the in-tree brcmfmac driver. It has a model number " + ewarn "BCM943602CS and is for sale on the second hand market for less than " + ewarn "20 USD." + ewarn + ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and" + ewarn " https://wikidevi.com/wiki/Broadcom_BCM943602CS" + ewarn "for more information." + ewarn +} + +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 ~!X86_INTEL_LPSS" + 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." + ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled." + 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-r4-linux-4.7.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-5.1.patch" + + epatch_user +} + +src_install() { + linux-mod_src_install + + dodoc "${DISTDIR}/README-${P}.txt" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch new file mode 100644 index 0000000..b23914a --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch @@ -0,0 +1,12 @@ +diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2013-08-01 09:52:22.000000000 +0300 ++++ b/src/wl/sys/wl_linux.c 2013-09-27 09:20:11.495023471 +0300 +@@ -235,7 +235,7 @@ + #define to_str(s) #s + #define quote_str(s) to_str(s) + +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + + static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); + diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch new file mode 100644 index 0000000..b5d7e85 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch @@ -0,0 +1,11 @@ +diff -urN a/src/wl/sys/wl_iw.h b/src/wl/sys/wl_iw.h +--- a/src/wl/sys/wl_iw.h 2013-08-01 09:52:22.000000000 +0300 ++++ b/src/wl/sys/wl_iw.h 2013-09-27 09:36:07.808067913 +0300 +@@ -21,6 +21,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-6.30.223.141-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch new file mode 100644 index 0000000..09c495d --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch @@ -0,0 +1,14 @@ +--- 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` diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch new file mode 100644 index 0000000..f93e3f1 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2014-06-26 10:42:08.000000000 +0000 ++++ b/Makefile 2014-07-17 22:44:01.662297228 +0000 +@@ -126,6 +126,8 @@ + EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include + #EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR + ++EXTRA_CFLAGS += -Wno-date-time ++ + EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped + + KBASE ?= /lib/modules/`uname -r` diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch new file mode 100644 index 0000000..9a0e713 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch @@ -0,0 +1,12 @@ +--- 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 +@@ -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); + diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch new file mode 100644 index 0000000..588f77a --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch @@ -0,0 +1,16 @@ +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,11 @@ + uint cycles; + + #if defined(__i386__) +- rdtscl(cycles); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) ++ cycles = (u32)rdtsc(); ++#else ++ rdtscl(cycles); ++#endif + #else + cycles = 0; + #endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch new file mode 100644 index 0000000..a779f8c --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch @@ -0,0 +1,52 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index a9671e2..da36405 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include <linux/kthread.h> + #include <linux/netdevice.h> + #include <linux/ieee80211.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include <linux/sched/signal.h> ++#endif + #include <net/cfg80211.h> + #include <linux/nl80211.h> + #include <net/rtnetlink.h> +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -117,6 +117,9 @@ int wl_found = 0; + + typedef struct priv_link { + wl_if_t *wlif; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ unsigned long last_rx; ++#endif + } priv_link_t; + + #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) +@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + { + struct sk_buff *oskb = (struct sk_buff *)p; + struct sk_buff *skb; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link_t *priv_link; ++#endif + uchar *pdata; + uint len; + +@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); ++ priv_link = netdev_priv(skb->dev); ++ priv_link->last_rx = jiffies; ++#else + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch new file mode 100644 index 0000000..94c6253 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch @@ -0,0 +1,64 @@ +diff -ru work.orig/src/wl/sys/wl_cfg80211_hybrid.c work.patched/src/wl/sys/wl_cfg80211_hybrid.c +--- work.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:50:27.328823384 -0700 ++++ work.patched/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:52:40.540809187 -0700 +@@ -52,8 +52,13 @@ + u32 wl_dbg_level = WL_DBG_ERR; + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++ enum nl80211_iftype type, struct vif_params *params); ++#else + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, + enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,7 +471,11 @@ + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, ++#else + enum nl80211_iftype type, u32 *flags, ++#endif + struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); +@@ -2361,12 +2370,26 @@ + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_roam_info roam_info = {}; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); + memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ roam_info.channel = &wl->conf->channel, ++ roam_info.bssid = (u8 *)&wl->bssid, ++ roam_info.req_ie = conn_info->req_ie, ++ roam_info.req_ie_len = conn_info->req_ie_len, ++ roam_info.resp_ie = conn_info->resp_ie, ++ roam_info.resp_ie_len = conn_info->resp_ie_len, ++ ++ cfg80211_roamed(ndev, &roam_info, GFP_KERNEL); ++#else + cfg80211_roamed(ndev, + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, +@@ -2374,6 +2397,7 @@ + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, + conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++#endif + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch new file mode 100644 index 0000000..91c4d89 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch @@ -0,0 +1,63 @@ +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -93,7 +93,11 @@ + + #include <wlc_wowl.h> + ++#ifdef HAVE_TIMER_SETUP ++static void wl_timer(struct timer_list *list); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2296,12 +2300,17 @@ + + atomic_dec(&t->wl->callbacks); + } +- ++#ifdef HAVE_TIMER_SETUP ++static void ++wl_timer(struct timer_list *list) ++{ ++ wl_timer_t *t = from_timer(t,list,timer); ++#else + static void + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; +- ++#endif + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); + else +@@ -2351,10 +2360,13 @@ + } + + bzero(t, sizeof(wl_timer_t)); +- ++#ifdef HAVE_TIMER_SETUP ++ timer_setup(&t->timer, wl_timer,0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; +diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.h ++++ b/src/wl/sys/wl_linux.h +@@ -190,3 +190,7 @@ + extern struct net_device * wl_netdev_get(wl_info_t *wl); + + #endif ++ ++#if defined(timer_setup) && defined(from_timer) ++#define HAVE_TIMER_SETUP ++#endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.7.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.7.patch new file mode 100644 index 0000000..566680a --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.7.patch @@ -0,0 +1,109 @@ +Since Linux 4.7, the enum ieee80211_band is no longer used + +This shall cause no problem's since both enums ieee80211_band +and nl80211_band were added in the same commit: +https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c + +This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_* + +Reference: +https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3 + +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:57:36.159340297 -0500 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:58:18.442323435 -0500 +@@ -236,7 +236,7 @@ + #endif + + #define CHAN2G(_channel, _freq, _flags) { \ +- .band = IEEE80211_BAND_2GHZ, \ ++ .band = NL80211_BAND_2GHZ, \ + .center_freq = (_freq), \ + .hw_value = (_channel), \ + .flags = (_flags), \ +@@ -245,7 +245,7 @@ + } + + #define CHAN5G(_channel, _flags) { \ +- .band = IEEE80211_BAND_5GHZ, \ ++ .band = NL80211_BAND_5GHZ, \ + .center_freq = 5000 + (5 * (_channel)), \ + .hw_value = (_channel), \ + .flags = (_flags), \ +@@ -379,7 +379,7 @@ + }; + + static struct ieee80211_supported_band __wl_band_2ghz = { +- .band = IEEE80211_BAND_2GHZ, ++ .band = NL80211_BAND_2GHZ, + .channels = __wl_2ghz_channels, + .n_channels = ARRAY_SIZE(__wl_2ghz_channels), + .bitrates = wl_g_rates, +@@ -387,7 +387,7 @@ + }; + + static struct ieee80211_supported_band __wl_band_5ghz_a = { +- .band = IEEE80211_BAND_5GHZ, ++ .band = NL80211_BAND_5GHZ, + .channels = __wl_5ghz_a_channels, + .n_channels = ARRAY_SIZE(__wl_5ghz_a_channels), + .bitrates = wl_a_rates, +@@ -395,7 +395,7 @@ + }; + + static struct ieee80211_supported_band __wl_band_5ghz_n = { +- .band = IEEE80211_BAND_5GHZ, ++ .band = NL80211_BAND_5GHZ, + .channels = __wl_5ghz_n_channels, + .n_channels = ARRAY_SIZE(__wl_5ghz_n_channels), + .bitrates = wl_a_rates, +@@ -1876,8 +1876,8 @@ + wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX; + #endif + wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); +- wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz; +- wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; ++ wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz; ++ wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; + wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; + wdev->wiphy->cipher_suites = __wl_cipher_suites; + wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites); +@@ -2000,7 +2000,7 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) + freq = ieee80211_channel_to_frequency(notif_bss_info->channel, + (notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? +- IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); ++ NL80211_BAND_2GHZ : NL80211_BAND_5GHZ); + #else + freq = ieee80211_channel_to_frequency(notif_bss_info->channel); + #endif +@@ -2116,7 +2116,7 @@ + return err; + } + chan = wf_chspec_ctlchan(chanspec); +- band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; ++ band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ; + freq = ieee80211_channel_to_frequency(chan, band); + channel = ieee80211_get_channel(wiphy, freq); + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL); +@@ -2250,10 +2250,10 @@ + join_params->params.chanspec_list[0] = + ieee80211_frequency_to_channel(chan->center_freq); + +- if (chan->band == IEEE80211_BAND_2GHZ) { ++ if (chan->band == NL80211_BAND_2GHZ) { + chanspec |= WL_CHANSPEC_BAND_2G; + } +- else if (chan->band == IEEE80211_BAND_5GHZ) { ++ else if (chan->band == NL80211_BAND_5GHZ) { + chanspec |= WL_CHANSPEC_BAND_5G; + } + else { +@@ -2885,7 +2885,7 @@ + + if (phy == 'n' || phy == 'a' || phy == 'v') { + wiphy = wl_to_wiphy(wl); +- wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n; ++ wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n; + } + + return err; diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.8.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.8.patch new file mode 100644 index 0000000..20e8a9a --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.8.patch @@ -0,0 +1,64 @@ +From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001 +From: Alberto Milone <alberto.milone@canonical.com> +Date: Fri, 2 Sep 2016 17:35:34 +0200 +Subject: [PATCH 1/1] Add support for Linux 4.8 + +Orginal author: Krzysztof Kolasa +--- + src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 2fc71fe..ec5e472 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++ WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + +@@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, + + scan_done_out: + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = false, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, false); ++#endif + wl->scan_request = NULL; + } + rtnl_unlock(); +@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev) + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + +-- +2.7.4 + diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch new file mode 100644 index 0000000..0dec5da --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-5.1.patch @@ -0,0 +1,22 @@ +--- src/wl/sys/wl_iw.c.old 2019-05-12 19:20:14.980551538 +1000 ++++ src/wl/sys/wl_iw.c 2019-05-12 19:19:19.815976398 +1000 +@@ -117,7 +117,7 @@ + ifr.ifr_data = (caddr_t) &ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else +--- src/wl/sys/wl_cfg80211_hybrid.c.old 2019-05-12 19:20:56.394980347 +1000 ++++ src/wl/sys/wl_cfg80211_hybrid.c 2019-05-12 19:18:21.852575023 +1000 +@@ -458,7 +458,7 @@ + ifr.ifr_data = (caddr_t)&ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml new file mode 100644 index 0000000..599aa05 --- /dev/null +++ b/net-wireless/broadcom-sta/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>eva@gentoo.org</email> + <name>Gilles Dartiguelongue</name> + </maintainer> + <upstream> + <remote-id type="launchpad">~albertomilone</remote-id> + </upstream> +</pkgmetadata> |