Merge 6081afca20258ff9aecc21e93d7a7cf03abd9e62 on remote branch (ca5a0168) · Commits · e / devices / android_kernel_fairphone_FP5

components/mlme/dispatcher/inc/cfg_mlme_acs.h

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-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
		@@ -176,7 +177,7 @@
		"normalize_acs_weight", \
		0, \
		ACS_WEIGHT_MAX_STR_LEN, \
		"5945-7125=0, 5975=100, 6055=100, 6135=100, 6215=100, 6295=100, 6375=100, 6615=100, 6695=100, 6775=100, 6855=100", \
		"2407-5875=40, 5945-7125=90, 5975=100, 6055=100, 6135=100, 6215=100, 6295=100, 6375=100, 6615=100, 6695=100, 6775=100, 6855=100", \
		"Used to specify the channel weights")

		/*

components/nan/core/src/nan_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -563,10 +563,12 @@ static QDF_STATUS nan_handle_confirm(struct nan_datapath_confirm_event *confirm)
		peer = wlan_objmgr_get_peer_by_mac(psoc,
		confirm->peer_ndi_mac_addr.bytes,
		WLAN_NAN_ID);
		if (!peer) {
		if (!peer && confirm->rsp_code == NAN_DATAPATH_RESPONSE_ACCEPT) {
		nan_debug("Drop NDP confirm as peer isn't available");
		return QDF_STATUS_E_NULL_VALUE;
		}

		if (peer)
		wlan_objmgr_peer_release_ref(peer, WLAN_NAN_ID);

		psoc_nan_obj = nan_get_psoc_priv_obj(psoc);

configs/default_defconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@ ifeq ($(CONFIG_CNSS_QCA6490), y)
		CONFIG_WLAN_TWT_SAP_STA_COUNT := y
		CONFIG_WLAN_TWT_SAP_PDEV_COUNT := y
		CONFIG_DUMP_REO_QUEUE_INFO_IN_DDR :=y
		ifeq ($(CONFIG_ARCH_LAHAINA), y)
		CONFIG_WLAN_TSF_UPLINK_DELAY := y
		endif
		endif

		ifeq ($(CONFIG_CNSS_QCA6750), y)
		@@ -1237,3 +1240,7 @@ endif
		endif

		CONFIG_WLAN_FEATURE_CAL_FAILURE_TRIGGER := y

		ifeq ($(CONFIG_CNSS_SM6150), y)
		CONFIG_ENABLE_LOW_POWER_MODE := y
		endif

core/hdd/inc/wlan_hdd_softap_tx_rx.h

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-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
		@@ -290,4 +291,52 @@ int hdd_softap_inspect_dhcp_packet(struct hdd_adapter *adapter,
		*/
		void hdd_softap_check_wait_for_tx_eap_pkt(struct hdd_adapter *adapter,
		struct qdf_mac_addr *mac_addr);

		#ifndef QCA_LL_LEGACY_TX_FLOW_CONTROL
		#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 19, 0))
		/**
		* hdd_skb_orphan() - skb_unshare a cloned packed else skb_orphan
		* @adapter: pointer to HDD adapter
		* @skb: pointer to skb data packet
		*
		* Return: pointer to skb structure
		*/
		static inline struct sk_buff hdd_skb_orphan(struct hdd_adapter adapter,
		struct sk_buff *skb)
		{
		struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);

		hdd_skb_fill_gso_size(adapter->dev, skb);

		if (skb_cloned(skb)) {
		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
		skb_orphan(skb);
		return skb;
		}

		if (unlikely(hdd_ctx->config->tx_orphan_enable)) {
		/*
		* For UDP packets we want to orphan the packet to allow the app
		* to send more packets. The flow would ultimately be controlled
		* by the limited number of tx descriptors for the vdev.
		*/
		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
		skb_orphan(skb);
		}

		return skb;
		}
		#else
		static inline struct sk_buff hdd_skb_orphan(struct hdd_adapter adapter,
		struct sk_buff *skb)
		{
		struct sk_buff *nskb;

		hdd_skb_fill_gso_size(adapter->dev, skb);
		nskb = skb_unshare(skb, GFP_ATOMIC);

		return nskb;
		}
		#endif
		#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
		#endif /* end #if !defined(WLAN_HDD_SOFTAP_TX_RX_H) */

core/hdd/src/wlan_hdd_active_tos.c

+6 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-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
		@@ -166,6 +167,11 @@ __wlan_hdd_cfg80211_set_limit_offchan_param(struct wiphy *wiphy,

		hdd_enter();

		if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
		hdd_err("Command not allowed in FTM mode");
		return -EPERM;
		}

		ret = wlan_hdd_validate_context(hdd_ctx);
		if (ret < 0)
		return ret;