Browse Source

qcacld-3.0: Add reqid to sched_scan_stop callback

Linux kernel version 4.12 added a reqid parameter to the sched_scan_stop
callback signature. Add conditional compilation to use the correct
callback signature based on the version of the Linux kernel being
compiled against.

Change-Id: I500807de15ef5301b480e7f25a3dd146073f573d
CRs-Fixed: 2094028
Dustin Brown 7 years ago
parent
commit
dfc5ef604e
2 changed files with 22 additions and 0 deletions
  1. 15 0
      core/hdd/src/wlan_hdd_scan.c
  2. 7 0
      core/hdd/src/wlan_hdd_scan.h

+ 15 - 0
core/hdd/src/wlan_hdd_scan.c

@@ -1601,6 +1601,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct net_device *dev)
 	return err;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
 int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
 				      struct net_device *dev)
 {
@@ -1612,6 +1613,20 @@ int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
 
 	return ret;
 }
+#else
+int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
+				      struct net_device *dev,
+				      uint64_t reqid)
+{
+	int ret;
+
+	cds_ssr_protect(__func__);
+	ret = __wlan_hdd_cfg80211_sched_scan_stop(dev);
+	cds_ssr_unprotect(__func__);
+
+	return ret;
+}
+#endif /* KERNEL_VERSION(4, 12, 0) */
 #endif /*FEATURE_WLAN_SCAN_PNO */
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) || \

+ 7 - 0
core/hdd/src/wlan_hdd_scan.h

@@ -55,6 +55,7 @@ int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 				       struct cfg80211_sched_scan_request
 				       *request);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
 /**
  * wlan_hdd_cfg80211_sched_scan_stop() - stop cfg80211 scheduled (PNO) scan
  * @wiphy: Pointer to wiphy
@@ -69,6 +70,12 @@ int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
  */
 int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
 				      struct net_device *dev);
+#else
+int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
+				      struct net_device *dev,
+				      uint64_t reqid);
+
+#endif /* KERNEL_VERSION(4, 12, 0) */
 
 /**
  * wlan_hdd_sched_scan_stop() - stop scheduled (PNO) scans