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

Commit 558da77b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c0bcc19a on remote branch 

Change-Id: Ic24bcf14baefe84e9e155f911db2e492174fb4a7
parents e4120aec c0bcc19a

Kbuild

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ UAPI_INC := -I$(WLAN_ROOT)/$(UAPI_DIR)/linux 
COMMON_DIR :=	core/common

COMMON_INC :=	-I$(WLAN_ROOT)/$(COMMON_DIR)



ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))

	cppflags-y += -DWLAN_WEAR_CHIPSET

endif



############ HDD ############

HDD_DIR :=	core/hdd

HDD_INC_DIR :=	$(HDD_DIR)/inc
@@ -3268,6 +3272,8 @@ cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE) += -DWLAN_FEATURE_PKT_CAPTURE 


cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2) += -DWLAN_FEATURE_PKT_CAPTURE_V2



cppflags-$(CONFIG_DP_RX_UDP_OVER_PEER_ROAM) += -DDP_RX_UDP_OVER_PEER_ROAM



cppflags-$(CONFIG_QCA_WIFI_NAPIER_EMULATION) += -DQCA_WIFI_NAPIER_EMULATION

cppflags-$(CONFIG_SHADOW_V2) += -DCONFIG_SHADOW_V2

cppflags-$(CONFIG_QCA6290_HEADERS_DEF) += -DQCA6290_HEADERS_DEF

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -13,7 +13,13 @@ M ?= $(shell pwd) 


# WLAN_ROOT must contain an absolute path (i.e. not a relative path)

KBUILD_OPTIONS := WLAN_ROOT=$(shell cd $(KERNEL_SRC); readlink -e $(M))



# MODNAME should be qca_cld3_wlan for helium based wear target

ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))

KBUILD_OPTIONS += MODNAME?=$(WLAN_WEAR_CHIPSET)_wlan

else

KBUILD_OPTIONS += MODNAME?=wlan

endif



#By default build for CLD

WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m

components/action_oui/dispatcher/src/wlan_action_oui_ucfg_api.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 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
@@ -156,7 +157,7 @@ QDF_STATUS ucfg_action_oui_send(struct wlan_objmgr_psoc *psoc) 
			continue;

		status = action_oui_send(psoc_priv, id);

		if (!QDF_IS_STATUS_SUCCESS(status))

			action_oui_err("Failed to send: %u", id);

			action_oui_debug("Failed to send: %u", id);

	}



exit:

components/cmn_services/interface_mgr/src/wlan_if_mgr_roam.c

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

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

 * Copyright (c) 2022 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 above
@@ -32,6 +33,7 @@ 
#include "wlan_vdev_mgr_utils_api.h"

#include "wni_api.h"

#include "wlan_mlme_vdev_mgr_interface.h"

#include "wlan_scan_api.h"



static void if_mgr_enable_roaming_on_vdev(struct wlan_objmgr_pdev *pdev,

					  void *object, void *arg)
@@ -744,6 +746,24 @@ QDF_STATUS if_mgr_validate_candidate(struct wlan_objmgr_vdev *vdev, 
	if (!psoc)

		return QDF_STATUS_E_FAILURE;



	/*

	 * Do not allow STA to connect on 6Ghz or indoor channel for non dbs

	 * hardware if SAP and skip_6g_and_indoor_freq_scan ini are present

	 */

	if (wlan_scan_cfg_skip_6g_and_indoor_freq(psoc) &&

	    !policy_mgr_is_hw_dbs_capable(psoc) &&

	    (WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_freq) ||

	    wlan_reg_is_freq_indoor(pdev, chan_freq)) &&

	    op_mode == QDF_STA_MODE &&

	    policy_mgr_mode_specific_connection_count(

				psoc, PM_SAP_MODE, NULL)) {

		ifmgr_debug("STA connection not allowed on bssid: "QDF_MAC_ADDR_FMT" with freq: %d (6Ghz or indoor(%d)), as SAP is present",

			    QDF_MAC_ADDR_REF(candidate_info->peer_addr.bytes),

			    chan_freq,

			    wlan_reg_is_freq_indoor(pdev, chan_freq));

		return QDF_STATUS_E_INVAL;

	}



	/*

	 * Ignore the BSS if any other vdev is already connected to it.

	 */

components/cmn_services/interface_mgr/src/wlan_if_mgr_sta.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 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 above
@@ -28,6 +29,7 @@ 
#include "wlan_p2p_ucfg_api.h"

#include "wlan_tdls_ucfg_api.h"

#include "wlan_tdls_api.h"

#include "wlan_cm_roam_api.h"



QDF_STATUS if_mgr_connect_start(struct wlan_objmgr_vdev *vdev,

				struct if_mgr_event_data *event_data)
@@ -140,6 +142,7 @@ QDF_STATUS if_mgr_connect_complete(struct wlan_objmgr_vdev *vdev, 


	policy_mgr_check_n_start_opportunistic_timer(psoc);



	if (!wlan_cm_roaming_in_progress(pdev, vdev->vdev_objmgr.vdev_id))

		policy_mgr_check_concurrent_intf_and_restart_sap(psoc);



	return QDF_STATUS_SUCCESS;