Re: [packman] broadcom-wl vs. kernel-4.8

[Manfred Hollstein]

Moin,

On Fri, 07 Oct 2016, 11:44:26 +0200, Manfred Hollstein wrote:
> Moin,
> 
> On Fri, 07 Oct 2016, 11:17:06 +0200, Manfred Hollstein wrote:
> > Hi there,
> > 
> > apparently the function cfg80211_scan_done has changed in kernel 4.8. On
> > the Debian bugtracker there is a report with a proper patch to fix the
> > problem at
> > 
> >   <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629>
> > 
> > Can someone please take a look at it and apply it so we get a working
> > module again for Factory's kernel?
> 
> FWIW, I have created a patch which applies cleanly to the latest src rpm
> from the Factory tree. It's attached to this e-mail.

hmm, something scrubbed the attachment from my last e-mail, so here it
is inline:

### begin of patch:
diff -rup broadcom-wl-6.30.223.248.orig/src/wl/sys/wl_cfg80211_hybrid.c 
broadcom-wl-6.30.223.248/src/wl/sys/wl_cfg80211_hybrid.c
--- broadcom-wl-6.30.223.248.orig/src/wl/sys/wl_cfg80211_hybrid.c       
2016-10-07 11:38:57.857206380 +0200
+++ broadcom-wl-6.30.223.248/src/wl/sys/wl_cfg80211_hybrid.c    2016-10-07 
11:41:41.561802881 +0200
@@ -2383,8 +2383,15 @@ wl_bss_connect_done(struct wl_cfg80211_p
        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, true);     
+               cfg80211_scan_done(wl->scan_request, &info);
+#else
+               cfg80211_scan_done(wl->scan_request, true);
+#endif
                wl->scan_request = NULL;
        }
 
@@ -2485,7 +2492,14 @@ wl_notify_scan_status(struct wl_cfg80211
 
 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();
@@ -2912,7 +2926,14 @@ s32 wl_cfg80211_down(struct net_device *
        s32 err = 0;
 
        if (wl->scan_request) {
-               cfg80211_scan_done(wl->scan_request, true);     
+#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;
        }
 
### end of patch.

Cheers.

l8er
manfred

signature.asc
Description: PGP signature

_______________________________________________
Packman mailing list
Packman@links2linux.de
http://lists.links2linux.de/cgi-bin/mailman/listinfo/packman