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

Commit 2163cb74 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-15200-SMxx50.QSSI13.0' of... 

Merge tag 'LA.UM.9.12.r1-15200-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 into android13-4.19-kona

"LA.UM.9.12.r1-15200-SMxx50.QSSI13.0"

* tag 'LA.UM.9.12.r1-15200-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0:
  Release 5.2.022.11T
  qcacld-3.0: Access vdev by reference
  Release 5.2.022.11S
  qcacld-3.0: Incorrect MCS index is passed
  Release 5.2.022.11R
  qcacld-3.0: Change default value of gSoftApMaxPeers
  Release 5.2.022.11Q
  qcacld-3.0: check staId index bound into timer array
  Release 5.2.022.11P
  qcacld-3.0: Enable dynamic GRO only for SM8150 and Lithium targets

 Conflicts:
	drivers/staging/qcacld-3.0/configs/default_defconfig

Change-Id: I35bb9434aa7420e693b3cf722e69ecf3529f6e5f
parents 3a81217a 1226de9d

components/mlme/dispatcher/inc/cfg_mlme_sap.h

+3 −2
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
@@ -269,7 +270,7 @@ 
 * gSoftApMaxPeers - Set Max peers connected for SAP

 * @Min: 1

 * @Max: 32

 * @Default: 32

 * @Default: 10

 *

 * This ini is used to set Max peers connected for SAP

 *
@@ -285,7 +286,7 @@ 
			"gSoftApMaxPeers", \

			1, \

			32, \

			32, \

			10, \

			CFG_VALUE_OR_DEFAULT, \

			"max no of peers")

configs/default_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ endif 


ifeq ($(CONFIG_ARCH_SM8150), y)

CONFIG_QCACLD_FEATURE_METERING := y

CONFIG_DYNAMIC_RX_AGGREGATION := y

endif



ifeq ($(CONFIG_HELIUMPLUS), y)
@@ -945,9 +946,8 @@ ifeq ($(CONFIG_LITHIUM), y) 
	#Enable WMI TX/RX over QMI

	CONFIG_WMI_SEND_RECV_QMI := y

	CONFIG_WLAN_DP_PENDING_MEM_FLUSH := y

endif



	CONFIG_DYNAMIC_RX_AGGREGATION := y

endif



#Flag to enable/disable WLAN D0-WOW

ifeq ($(CONFIG_PCI_MSM), y)

core/hdd/src/wlan_hdd_hostapd.c

+4 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,10 @@ static int calcuate_max_phy_rate(int mode, int nss, int ch_width, 
	if (mode == SIR_SME_PHY_MODE_HT) {

		/* check for HT Mode */

		maxidx = ht_mcs_idx;

		if (maxidx > 7) {

			hdd_err("ht_mcs_idx %d is incorrect", ht_mcs_idx);

			return maxrate;

		}

		if (nss == 1) {

			supported_mcs_rate = supported_mcs_rate_nss1;

		} else if (nss == 2) {

core/hdd/src/wlan_hdd_stats.c

+21 −11
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-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
@@ -44,6 +45,7 @@ 
#include "wlan_hdd_sta_info.h"

#include "cdp_txrx_host_stats.h"

#include "cdp_txrx_misc.h"

#include "wlan_hdd_object_manager.h"



#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS)

#define HDD_INFO_SIGNAL                 STATION_INFO_SIGNAL
@@ -6013,12 +6015,17 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter) 
	struct stats_event *stats;

	struct wlan_mlme_nss_chains *dynamic_cfg;

	uint32_t tx_nss, rx_nss;

	struct wlan_objmgr_vdev *vdev;



	stats = wlan_cfg80211_mc_cp_stats_get_station_stats(adapter->vdev,

	vdev = hdd_objmgr_get_vdev(adapter);

	if (!vdev)

		return -EINVAL;



	stats = wlan_cfg80211_mc_cp_stats_get_station_stats(vdev,

							    &ret);

	if (ret || !stats) {

		wlan_cfg80211_mc_cp_stats_free_stats_event(stats);

		return ret;

		goto out;

	}



	/* save summary stats to legacy location */
@@ -6059,11 +6066,12 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter) 
	adapter->hdd_stats.peer_stats.fcs_count =

		stats->peer_adv_stats->fcs_count;



	dynamic_cfg = mlme_get_dynamic_vdev_config(adapter->vdev);

	dynamic_cfg = mlme_get_dynamic_vdev_config(vdev);

	if (!dynamic_cfg) {

		hdd_err("nss chain dynamic config NULL");

		wlan_cfg80211_mc_cp_stats_free_stats_event(stats);

		return -EINVAL;

		ret = -EINVAL;

		goto out;

	}



	switch (hdd_conn_get_connected_band(&adapter->session.station)) {
@@ -6076,15 +6084,15 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter) 
		rx_nss = dynamic_cfg->rx_nss[NSS_CHAINS_BAND_5GHZ];

		break;

	default:

		tx_nss = wlan_vdev_mlme_get_nss(adapter->vdev);

		rx_nss = wlan_vdev_mlme_get_nss(adapter->vdev);

		tx_nss = wlan_vdev_mlme_get_nss(vdev);

		rx_nss = wlan_vdev_mlme_get_nss(vdev);

	}

	/* Intersection of self and AP's NSS capability */

	if (tx_nss > wlan_vdev_mlme_get_nss(adapter->vdev))

		tx_nss = wlan_vdev_mlme_get_nss(adapter->vdev);

	if (tx_nss > wlan_vdev_mlme_get_nss(vdev))

		tx_nss = wlan_vdev_mlme_get_nss(vdev);



	if (rx_nss > wlan_vdev_mlme_get_nss(adapter->vdev))

		rx_nss = wlan_vdev_mlme_get_nss(adapter->vdev);

	if (rx_nss > wlan_vdev_mlme_get_nss(vdev))

		rx_nss = wlan_vdev_mlme_get_nss(vdev);



	/* save class a stats to legacy location */

	adapter->hdd_stats.class_a_stat.tx_nss = tx_nss;
@@ -6114,7 +6122,9 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter) 
		     sizeof(stats->vdev_chain_rssi[0].chain_rssi));

	wlan_cfg80211_mc_cp_stats_free_stats_event(stats);



	return 0;

out:

	hdd_objmgr_put_vdev(vdev);

	return ret;

}



struct temperature_priv {

core/mac/inc/qwlan_version.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#define QWLAN_VERSION_MAJOR            5

#define QWLAN_VERSION_MINOR            2

#define QWLAN_VERSION_PATCH            022

#define QWLAN_VERSION_EXTRA            "O"

#define QWLAN_VERSION_EXTRA            "T"

#define QWLAN_VERSION_BUILD            11



#define QWLAN_VERSIONSTR               "5.2.022.11O"

#define QWLAN_VERSIONSTR               "5.2.022.11T"



#endif /* QWLAN_VERSION_H */