diff options
| author | Andrey Vihrov | 2016-11-12 17:03:48 +0200 |
|---|---|---|
| committer | Andrey Vihrov | 2016-11-12 17:03:48 +0200 |
| commit | a018bc2c635876634e8793771f18c3cd47d70f1b (patch) | |
| tree | b9c9689c0ef7cf2781235254ebe8f659fa180b1d | |
| parent | cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71 (diff) | |
| download | aur-a018bc2c635876634e8793771f18c3cd47d70f1b.tar.gz | |
Better version of the Linux 4.8 patch (but no functional changes)
| -rw-r--r-- | 004-linux48.patch | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/004-linux48.patch b/004-linux48.patch index 0f3e81906226..20e8a9ae49d2 100644 --- a/004-linux48.patch +++ b/004-linux48.patch @@ -1,31 +1,41 @@ -Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629 +From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001 +From: Alberto Milone <alberto.milone@canonical.com> +Date: Fri, 2 Sep 2016 17:35:34 +0200 +Subject: [PATCH 1/1] Add support for Linux 4.8 ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-10-03 10:53:55.588036464 +0200 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-10-03 10:54:11.911695944 +0200 -@@ -2386,8 +2386,15 @@ +Orginal author: Krzysztof Kolasa +--- + src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +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 ++ .aborted = true, + }; - WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); -- cfg80211_scan_done(wl->scan_request, true); ++ WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); + cfg80211_scan_done(wl->scan_request, &info); +#else -+ cfg80211_scan_done(wl->scan_request, true); + WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); + cfg80211_scan_done(wl->scan_request, true); +#endif wl->scan_request = NULL; } -@@ -2488,7 +2495,14 @@ +@@ -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 ++ .aborted = false, + }; + cfg80211_scan_done(wl->scan_request, &info); +#else @@ -34,19 +44,21 @@ Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629 wl->scan_request = NULL; } rtnl_unlock(); -@@ -2913,7 +2927,14 @@ +@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev) 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 ++ .aborted = true, + }; + cfg80211_scan_done(wl->scan_request, &info); +#else -+ cfg80211_scan_done(wl->scan_request, true); + cfg80211_scan_done(wl->scan_request, true); +#endif wl->scan_request = NULL; } +-- +2.7.4 + |