commit 3cf15355b80f564d401b30645d6b1d9b468aceb6 Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; Date: Wed Jul 5 17:06:44 2017 +0200 Rework patch for kernel >= 4.12 - thanks to Tim Thomas ...kernel_4.12_add_cfg80211_roam_info_struct.patch | 39 +++++++++++++++++++--- wl-kmod.spec | 5 ++- 2 files changed, 38 insertions(+), 6 deletions(-) --- diff --git a/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch b/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch index bbc6622..cdc3ffe 100644 --- a/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch +++ b/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch @@ -1,7 +1,34 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c --- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-04-10 14:23:40.909434506 +0200 -+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-03 15:40:21.595077248 +0200 -@@ -2440,6 +2440,9 @@ ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2017-07-03 11:32:04.271398087 +0200 +@@ -54,7 +54,11 @@ + #endif + + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +- enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++ enum nl80211_iftype type, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) ++ u32 *flags, ++#endif ++ struct vif_params *params); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -499,8 +503,11 @@ + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +- enum nl80211_iftype type, u32 *flags, +- struct vif_params *params) ++ enum nl80211_iftype type, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) ++ u32 *flags, ++#endif ++ struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); + struct wireless_dev *wdev; +@@ -2440,6 +2447,9 @@ const wl_event_msg_t *e, void *data) { struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); @@ -11,7 +38,7 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_ s32 err = 0; err = wl_get_assoc_ies(wl); -@@ -2453,13 +2456,27 @@ +@@ -2453,13 +2463,28 @@ if (err) return err; @@ -31,10 +58,12 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_ #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, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, +#else -+ &roam_info, GFP_KERNEL); ++ &roam_info, +#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); diff --git a/wl-kmod.spec b/wl-kmod.spec index 66c1e13..a6ec4d6 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -8,7 +8,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -105,6 +105,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 05 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-13 +- Rework patch for kernel >= 4.12 - thanks to Tim Thomas + * Sat Jun 03 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-12 - Add patch for kernel >= 4.12 - add cfg80211_roam_info struct in wl_bss_roaming_done function