From dc47aaaefdc3da7f401f64285c11d9987da84c1c Mon Sep 17 00:00:00 2001
From: bings <bings@codeaurora.org>
Date: Mon, 16 Mar 2020 16:54:29 +0800
Subject: [PATCH] qcacld-3.0: Fix build error of prev_bssid of
 cfg80211_connect_params

prev_bssid of cfg80211_connect_params can only be accessed when there
is prev_bssid field in struct cfg80211_connect_params.

Change-Id: I370bb76e180b9eae1b34f8fd33e9551f6e42bf65
CRs-Fixed: 2642334
---
 core/hdd/src/wlan_hdd_cfg80211.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 37fb6cb0a8ac..2ceec89c6c77 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -19655,6 +19655,24 @@ wlan_hdd_check_ht20_ht40_ind(struct hdd_context *hdd_ctx,
 }
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
+/**
+ * hdd_dump_prev_bssid() - dump prev_bssid of cfg80211_connect_params
+ * @req: pointer ro cfg80211_connect_params
+ *
+ * Return: void
+ */
+static inline void hdd_dump_prev_bssid(struct cfg80211_connect_params *req)
+{
+	if (req->prev_bssid)
+		hdd_nofl_debug("prev BSSID %pM", req->prev_bssid);
+}
+#else
+static inline void hdd_dump_prev_bssid(struct cfg80211_connect_params *req)
+{
+}
+#endif
+
 static inline void hdd_dump_connect_req(struct hdd_adapter *adapter,
 					struct net_device *ndev,
 					struct cfg80211_connect_params *req)
@@ -19673,8 +19691,7 @@ static inline void hdd_dump_connect_req(struct hdd_adapter *adapter,
 		hdd_nofl_debug("BSSID %pM", req->bssid);
 	if (req->bssid_hint)
 		hdd_nofl_debug("BSSID hint %pM", req->bssid_hint);
-	if (req->prev_bssid)
-		hdd_nofl_debug("prev BSSID %pM", req->prev_bssid);
+	hdd_dump_prev_bssid(req);
 
 	for (i = 0; i < req->crypto.n_akm_suites; i++)
 		hdd_nofl_debug("akm[%d] = %x", i, req->crypto.akm_suites[i]);