dlan 14/12/15 06:25:39
Added: broadcom-sta-6.30.223.248-linux-3.17.patch
broadcom-sta-6.30.223.248-linux-3.18.patch
Log:
fix build err with kernel 3.17/3.18, bug 523326
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xAABEFD55)
Revision Changes Path
1.1
net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.17.patch?rev=1.1&content-type=text/plain
Index: broadcom-sta-6.30.223.248-linux-3.17.patch
===================================================================
>From 5f7db08c046bd31b162a102ca868fa334a0357b9 Mon Sep 17 00:00:00 2001
From: Michael Marineau <m...@marineau.org>
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
1.1
net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-linux-3.18.patch?rev=1.1&content-type=text/plain
Index: broadcom-sta-6.30.223.248-linux-3.18.patch
===================================================================
>From 5aae9ccfda6dfc680403b4a5ff9a36dcd5331dfd Mon Sep 17 00:00:00 2001
From: Michael Marineau <m...@marineau.org>
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
