diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2017-06-10 15:55:01 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2017-06-10 15:55:01 -0700 |
| commit | 585c4d59c257faae50dd714419b97683381b1432 (patch) | |
| tree | b3f2294ef1226bf31ea5ca327775f96aa94ca07b /net-wireless | |
| parent | net-wireless/broadcom-sta: apply archlinux patch fixing bugs for kernel 4.11 (diff) | |
| download | gentoo-585c4d59c257faae50dd714419b97683381b1432.tar.gz gentoo-585c4d59c257faae50dd714419b97683381b1432.tar.bz2 gentoo-585c4d59c257faae50dd714419b97683381b1432.zip | |
net-wireless/broadcom-sta: Patch for Linux 4.12 changes
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild | 3 | ||||
| -rw-r--r-- | net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch | 64 |
2 files changed, 66 insertions, 1 deletions
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 index d86dba144a27..5cf284a4cebb 100644 --- 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 @@ -66,7 +66,8 @@ src_prepare() { "${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.11.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" epatch_user } 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 000000000000..94c6253f803e --- /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); |