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

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

Merge 585077c3 on remote branch 

Change-Id: I6fbba9a6cb172b4dbde34f0bdb48d4920c40c732
parents bcf5cf28 585077c3

Kbuild

+4 −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

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_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;

components/pkt_capture/core/src/wlan_pkt_capture_main.c

+8 −2
Original line number Diff line number Diff line
@@ -1313,6 +1313,11 @@ QDF_STATUS pkt_capture_set_filter(struct pkt_capture_frame_filter frame_filter, 
	if (vdev_priv->frame_filter.mgmt_rx_frame_filter &

	    PKT_CAPTURE_MGMT_FRAME_TYPE_ALL) {

		mode |= PACKET_CAPTURE_MODE_MGMT_ONLY;

		vdev_priv->frame_filter.mgmt_rx_frame_filter |=

					PKT_CAPTURE_MGMT_CONNECT_BEACON;

		vdev_priv->frame_filter.mgmt_rx_frame_filter |=

					PKT_CAPTURE_MGMT_CONNECT_SCAN_BEACON;

		if (!send_bcn)

			config |= PACKET_CAPTURE_CONFIG_BEACON_ENABLE;

		config |= PACKET_CAPTURE_CONFIG_OFF_CHANNEL_BEACON_ENABLE;

	} else {
@@ -1328,6 +1333,7 @@ QDF_STATUS pkt_capture_set_filter(struct pkt_capture_frame_filter frame_filter, 
	if (check_enable_beacon) {

		if (vdev_priv->frame_filter.mgmt_rx_frame_filter &

		    PKT_CAPTURE_MGMT_CONNECT_BEACON)

			if (!send_bcn)

				config |= PACKET_CAPTURE_CONFIG_BEACON_ENABLE;



		if (vdev_priv->frame_filter.mgmt_rx_frame_filter &