projects / packages / wl.git / blame
| Commit | Line | Data |
|---|---|---|
| 0e2168f7 JR |
1 | |
| 2 | Package: broadcom-sta-source | |
| 3 | Version: 6.30.223.271-3 | |
| 4 | ||
| 5 | Looking at the patch for kernel 4.8, I came up with the attached patch | |
| 6 | (and I send this mail while running it :) | |
| 7 | ||
| 8 | Thanks, | |
| 9 | Koos Vriezen | |
| 10 | ||
| 11 | ||
| 12 | --- broadcom-sta.orig/src/wl/sys/wl_cfg80211_hybrid.c.orig 2016-10-03 10:53:55.588036464 +0200 | |
| 13 | +++ broadcom-sta.orig/src/wl/sys/wl_cfg80211_hybrid.c 2016-10-03 10:54:11.911695944 +0200 | |
| 14 | @@ -2386,8 +2386,15 @@ | |
| 15 | s32 err = 0; | |
| 16 | ||
| 17 | if (wl->scan_request) { | |
| 18 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 19 | + struct cfg80211_scan_info info = { | |
| 20 | + .aborted = true | |
| 21 | + }; | |
| 22 | WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); | |
| 23 | - cfg80211_scan_done(wl->scan_request, true); | |
| 24 | + cfg80211_scan_done(wl->scan_request, &info); | |
| 25 | +#else | |
| 26 | + cfg80211_scan_done(wl->scan_request, true); | |
| 27 | +#endif | |
| 28 | wl->scan_request = NULL; | |
| 29 | } | |
| 30 | ||
| 31 | @@ -2488,7 +2495,14 @@ | |
| 32 | ||
| 33 | scan_done_out: | |
| 34 | if (wl->scan_request) { | |
| 35 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 36 | + struct cfg80211_scan_info info = { | |
| 37 | + .aborted = false | |
| 38 | + }; | |
| 39 | + cfg80211_scan_done(wl->scan_request, &info); | |
| 40 | +#else | |
| 41 | cfg80211_scan_done(wl->scan_request, false); | |
| 42 | +#endif | |
| 43 | wl->scan_request = NULL; | |
| 44 | } | |
| 45 | rtnl_unlock(); | |
| 46 | @@ -2913,7 +2927,14 @@ | |
| 47 | s32 err = 0; | |
| 48 | ||
| 49 | if (wl->scan_request) { | |
| 50 | - cfg80211_scan_done(wl->scan_request, true); | |
| 51 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 52 | + struct cfg80211_scan_info info = { | |
| 53 | + .aborted = true | |
| 54 | + }; | |
| 55 | + cfg80211_scan_done(wl->scan_request, &info); | |
| 56 | +#else | |
| 57 | + cfg80211_scan_done(wl->scan_request, true); | |
| 58 | +#endif | |
| 59 | wl->scan_request = NULL; | |
| 60 | } | |
| 61 |