samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add reqid to sched_scan_stop callback

Browse Source 
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
This commit is contained in:
Dustin Brown
2017-08-16 15:20:11 -07:00
committed by snandini
parent 088e7ccc4c
commit dfc5ef604e
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/hdd/src/wlan_hdd_scan.c
View File

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

7
core/hdd/src/wlan_hdd_scan.h
View File

@@ -55,6 +55,7 @@ int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
struct cfg80211_sched_scan_request struct cfg80211_sched_scan_request
*request); *request);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
/** /**
* wlan_hdd_cfg80211_sched_scan_stop() - stop cfg80211 scheduled (PNO) scan * wlan_hdd_cfg80211_sched_scan_stop() - stop cfg80211 scheduled (PNO) scan
* @wiphy: Pointer to wiphy * @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, int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
struct net_device *dev); 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 * wlan_hdd_sched_scan_stop() - stop scheduled (PNO) scans