Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 530b83df authored by Ramanasarvesh Sadula's avatar Ramanasarvesh Sadula Committed by Dundi Raviteja
Browse files

wlan: Migrate to schedule scan APIs as per 4.14 kernel 

Migrate to schedule scan APIs as per 4.14 kernel.

Change-Id: I71bdd874d180037bb77e24cec3d04dacfba56696
CRs-Fixed: 2697901
parent c0ead1bd

CORE/HDD/inc/wlan_hdd_cfg80211.h

+1 −0
Original line number Diff line number Diff line
@@ -2121,6 +2121,7 @@ void wlan_hdd_cfg80211_scan_randomization_init(struct wiphy *wiphy) 


#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))

#define nla_parse(a, b, c, d, e) nla_parse(a, b, c, d, e, NULL)

#define cfg80211_sched_scan_results(a) cfg80211_sched_scan_results(a, 0)

#endif



#endif

CORE/HDD/src/wlan_hdd_cfg80211.c

+9 −0
Original line number Diff line number Diff line
@@ -9419,7 +9419,11 @@ int wlan_hdd_cfg80211_init(struct device *dev, 
#ifdef FEATURE_WLAN_SCAN_PNO

    if (pCfg->configPNOScanSupport)

    {

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))

	wiphy->max_sched_scan_reqs = 1;

#else

        wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;

#endif

        wiphy->max_sched_scan_ssids = SIR_PNO_MAX_SUPP_NETWORKS;

        wiphy->max_match_sets       = SIR_PNO_MAX_SUPP_NETWORKS;

        wiphy->max_sched_scan_ie_len = SIR_MAC_MAX_IE_LENGTH;
@@ -20597,8 +20601,13 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, 
 * FUNCTION: wlan_hdd_cfg80211_sched_scan_stop

 * NL interface to disable PNO

 */

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))

static int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,

          struct net_device *dev, u64 reqid)

#else

static int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,

          struct net_device *dev)

#endif

{

    int ret;