From a11edcba429ca04609326fac62237da597f9ee5a Mon Sep 17 00:00:00 2001
From: "Selvaraj, Sridhar" <sselvara@codeaurora.org>
Date: Wed, 7 Sep 2016 18:49:14 +0530
Subject: [PATCH] qcacld-3.0: Enable kernel specific WiFiSON changes default
 from 4.7.0 kernel

Enable driver changes dependent on kernel flags CFG80211_SCAN_BSSID
and CFG80211_CONNECT_PREV_BSSID default for linux kernels starting
from version 4.7.0 as the dependent kernel changes are present from
this version.

Change-Id: I0ee25eb11c75c688becbf61b4424bd0bae28bd3a
CRs-Fixed: 1064018
---
 core/hdd/src/wlan_hdd_cfg80211.c | 3 ++-
 core/hdd/src/wlan_hdd_scan.c     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index ce3e7907bb88..1da11ee297d6 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -12148,7 +12148,8 @@ disconnected:
  *
  * Return: true if connect was for ReAssociation, false otherwise
  */
-#ifdef CFG80211_CONNECT_PREV_BSSID
+#if defined(CFG80211_CONNECT_PREV_BSSID) || \
+	(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
 static bool wlan_hdd_reassoc_bssid_hint(hdd_adapter_t *adapter,
 					struct cfg80211_connect_params *req,
 					int *status)
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index e063008d9091..20c53b3c3c97 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -1271,7 +1271,8 @@ static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work)
  *
  * Return: None
  */
-#ifdef CFG80211_SCAN_BSSID
+#if defined(CFG80211_SCAN_BSSID) || \
+	(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
 static inline void wlan_hdd_copy_bssid_scan_request(tCsrScanRequest *scan_req,
 					struct cfg80211_scan_request *request)
 {