Add more patches for wl driver

[android-x86/external-kernel-drivers.git] / wl / wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch

diff --git a/wl/004-linux48.patch b/wl/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
similarity index 54%
rename from wl/004-linux48.patch
rename to wl/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
index 20e8a9a..1b643e3 100644 (file)
--- a/wl/004-linux48.patch
+++ b/wl/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
@@ -1,18 +1,7 @@
-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
-
-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,
+diff -Naur a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+--- a/src/wl/sys/wl_cfg80211_hybrid.c  2016-09-07 22:38:13.303835653 +0200
++++ b/src/wl/sys/wl_cfg80211_hybrid.c  2016-09-07 22:54:53.550730661 +0200
+@@ -2439,8 +2439,17 @@
        s32 err = 0;
  
        if (wl->scan_request) {
@@ -20,16 +9,17 @@ index 2fc71fe..ec5e472 100644
 +              struct cfg80211_scan_info info = {
 +                      .aborted = true,
 +              };
-+              WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
++#endif
+               WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
 +              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,
+@@ -2541,7 +2550,14 @@
  
  scan_done_out:
        if (wl->scan_request) {
@@ -44,7 +34,7 @@ index 2fc71fe..ec5e472 100644
                wl->scan_request = NULL;
        }
        rtnl_unlock();
-@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
+@@ -2970,7 +2986,14 @@
        s32 err = 0;
  
        if (wl->scan_request) {
@@ -59,6 +49,3 @@ index 2fc71fe..ec5e472 100644
                wl->scan_request = NULL;
        }
  
--- 
-2.7.4
-