| Revision 11261, 1.5 KB checked in by ara_t, 9 years ago (diff) |
|---|
Package: broadcom-sta-source
Version: 6.30.223.271-3
Looking at the patch for kernel 4.8, I came up with the attached patch
(and I send this mail while running it :)
Thanks,
Koos Vriezen
| old | new | |
|---|---|---|
| 2386 | 2386 | s32 err = 0; |
| 2387 | 2387 | |
| 2388 | 2388 | if (wl->scan_request) { |
| 2389 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 2390 | struct cfg80211_scan_info info = { | |
| 2391 | .aborted = true | |
| 2392 | }; | |
| 2389 | 2393 | WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); |
| 2390 | cfg80211_scan_done(wl->scan_request, true); | |
| 2394 | cfg80211_scan_done(wl->scan_request, &info); | |
| 2395 | #else | |
| 2396 | cfg80211_scan_done(wl->scan_request, true); | |
| 2397 | #endif | |
| 2391 | 2398 | wl->scan_request = NULL; |
| 2392 | 2399 | } |
| 2393 | 2400 | |
| … | … | |
| 2488 | 2495 | |
| 2489 | 2496 | scan_done_out: |
| 2490 | 2497 | if (wl->scan_request) { |
| 2498 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 2499 | struct cfg80211_scan_info info = { | |
| 2500 | .aborted = false | |
| 2501 | }; | |
| 2502 | cfg80211_scan_done(wl->scan_request, &info); | |
| 2503 | #else | |
| 2491 | 2504 | cfg80211_scan_done(wl->scan_request, false); |
| 2505 | #endif | |
| 2492 | 2506 | wl->scan_request = NULL; |
| 2493 | 2507 | } |
| 2494 | 2508 | rtnl_unlock(); |
| … | … | |
| 2913 | 2927 | s32 err = 0; |
| 2914 | 2928 | |
| 2915 | 2929 | if (wl->scan_request) { |
| 2916 | cfg80211_scan_done(wl->scan_request, true); | |
| 2930 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) | |
| 2931 | struct cfg80211_scan_info info = { | |
| 2932 | .aborted = true | |
| 2933 | }; | |
| 2934 | cfg80211_scan_done(wl->scan_request, &info); | |
| 2935 | #else | |
| 2936 | cfg80211_scan_done(wl->scan_request, true); | |
| 2937 | #endif | |
| 2917 | 2938 | wl->scan_request = NULL; |
| 2918 | 2939 | } |
| 2919 | 2940 |