--- bcmwl/src/wl/sys/wl_linux.c.orig 2016-10-28 09:42:36.791529056 +0000 +++ bcmwl/src/wl/sys/wl_linux.c 2016-10-28 09:42:57.421815648 +0000 @@ -2048,8 +2048,8 @@ void wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b) { - bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit, - __DATE__, __TIME__, EPI_VERSION_STR); + bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit, + EPI_VERSION_STR); } #if defined(BCMDBG) 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; }