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

Commit 20f4ee29 authored by Ashish's avatar Ashish Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Enable nan only for VLP channels for 6GHz 

Currently for 6GHz, nan is allowed on LPI channels as well,
nan should be allowed only on VLP channels.

With this change allow nan only on VLP channels.

CRs-Fixed: 3072585
Change-Id: Ic8cd8a5ca5c096530762cc0f9d199cef30155838
parent b18d3d01

components/nan/core/src/nan_api.c

+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -410,10 +411,36 @@ QDF_STATUS nan_psoc_disable(struct wlan_objmgr_psoc *psoc) 
	return QDF_STATUS_SUCCESS;

}



static bool

wlan_is_nan_allowed_on_6ghz_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)

{

	QDF_STATUS status;

	struct regulatory_channel chan_list[NUM_6GHZ_CHANNELS];

	uint16_t i;



	status = wlan_reg_get_6g_ap_master_chan_list(pdev,

						     REG_VERY_LOW_POWER_AP,

						     chan_list);



	for (i = 0; i < NUM_6GHZ_CHANNELS; i++) {

		if ((freq == chan_list[i].center_freq) &&

		    (chan_list[i].state == CHANNEL_STATE_ENABLE))

			return true;

	}



	return false;

}



bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)

{

	bool nan_allowed = true;



	/* Check for 6GHz channels */

	if (wlan_reg_is_6ghz_chan_freq(freq)) {

		nan_allowed = wlan_is_nan_allowed_on_6ghz_freq(pdev, freq);

		return nan_allowed;

	}



	/* Check for SRD channels */

	if (wlan_reg_is_etsi13_srd_chan_for_freq(pdev, freq))

		wlan_mlme_get_srd_master_mode_for_vdev(wlan_pdev_get_psoc(pdev),