Merge "wlan: Get sw pta from wcnss driver" into wlan-driver.lnx.1.0 (5a770e47) · Commits · e / devices / android_kernel_fairphone_FP3

CORE/HDD/inc/wlan_hdd_main.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -2437,6 +2437,11 @@ static inline int wcnss_update_bt_profile(void)
		{
		return 0;
		}

		static inline int wcnss_is_sw_pta_enabled(void)
		{
		return 0;
		}
		#endif

		#ifdef FEATURE_WLAN_SW_PTA

+3 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		#include "qwlan_version.h"
		#include "wlan_logging_sock_svc.h"
		#include "wlan_hdd_misc.h"

		#include <linux/wcnss_wlan.h>

		#define g_mode_rates_size (12)
		#define a_mode_rates_size (8)
		@@ -623,7 +623,8 @@ static const struct nla_policy wlan_hdd_tm_policy[WLAN_HDD_TM_ATTR_MAX + 1] =
		#ifdef FEATURE_WLAN_SW_PTA
		bool hdd_is_sw_pta_enabled(hdd_context_t *hdd_ctx)
		{
		return hdd_ctx->cfg_ini->is_sw_pta_enabled;
		return hdd_ctx->cfg_ini->is_sw_pta_enabled \|\|
		wcnss_is_sw_pta_enabled();
		}
		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -4009,7 +4009,7 @@ int vos_process_bt_profile(bool bt_enabled, bool bt_adv,
		return -EINVAL;
		}

		if (!hdd_ctx->cfg_ini->is_sw_pta_enabled) {
		if (!hdd_is_sw_pta_enabled(hdd_ctx)) {
		VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
		"%s: sw pta is not enabled", __func__);
		return -EINVAL;