Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea8d79f08e4f3a9aa3a2909475b396b171317205
commit ea8d79f08e4f3a9aa3a2909475b396b171317205 Author: DeX77 <de...@frugalware.org> Date: Thu Jul 13 14:20:26 2017 +0200 bcmwl-6.30.223.271-65-x86_64 * fix build diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 87467ca..7c245eb 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bcmwl pkgver=6.30.223.271 -pkgrel=64 +pkgrel=65 pkgdesc="Broadcom 802.11 Linux STA wireless driver" url="https://www.broadcom.com/support/802.11"; Finclude kernel-module @@ -18,13 +18,15 @@ source=(https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_6 null-poiter-crash.patch \ linux-4.7.patch \ linux-4.8.patch \ - linux-4.11.patch ) + linux-4.11.patch \ + linux-4.12.patch ) sha1sums=('1f568bb989d175813c5631c6629d9479eae6f3be' \ 'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13' \ 'b400d4eb8a531c7329a28f2be4ce3b4bd37e1d56' \ '95243e5fcd9b32459c9a945f1b0ac217dab1755a' \ 'c0447fa30afc7091261fa5aa497135815ef2e70d' \ - '7496ccd8212198a3f76cc2c34c874e7108efe200') + '7496ccd8212198a3f76cc2c34c874e7108efe200' \ + '1d3fb939df5ba3b04e2949df6c5ed24f4a3d1f48') build() { diff --git a/source/network-extra/bcmwl/linux-4.12.patch b/source/network-extra/bcmwl/linux-4.12.patch new file mode 100644 index 0000000..8abc73d --- /dev/null +++ b/source/network-extra/bcmwl/linux-4.12.patch @@ -0,0 +1,68 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index da36405..d3741eb 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR; + #endif + + 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, struct vif_params *params); ++#else + 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 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + + 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,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + 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_bss *bss; ++ struct wlc_ssid *ssid; ++ ssid = &wl->profile->ssid; ++ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, ++ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); ++ struct cfg80211_roam_info roam_info = { ++ .bss = bss, ++ .req_ie = conn_info->req_ie, ++ .req_ie_len = conn_info->req_ie_len, ++ .resp_ie = conn_info->resp_ie, ++ .resp_ie_len = conn_info->resp_ie_len, ++ }; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); +@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); + cfg80211_roamed(ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ &roam_info, ++#else + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, + #endif + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, +- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, ++#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
