Merge tag 'be4f9bb7ee49f16db1824cd9eee6611acfaafa3f' into lineage-17.1 (7cd9d052) · Commits · e / devices / android_kernel_sony_msm8998

drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_nan_datapath.h

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2018 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
		@@ -35,7 +36,6 @@ struct wireless_dev;
		#define NAN_SOCIAL_CHANNEL_5GHZ_LOWER_BAND 44
		#define NAN_SOCIAL_CHANNEL_5GHZ_UPPER_BAND 149

		#define NDP_APP_INFO_LEN 255
		#define NDP_PMK_LEN 32
		#define NDP_SCID_BUF_LEN 256
		#define NDP_NUM_INSTANCE_ID 255

drivers/staging/qcacld-3.0/core/mac/src/include/dot11f.h

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019, 2021 The Linux Foundation. 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
		@@ -26,7 +26,7 @@
		*
		*
		* This file was automatically generated by 'framesc'
		* Mon Mar 25 14:48:07 2019 from the following file(s):
		* Wed Sep 29 13:23:21 2021 from the following file(s):
		*
		* dot11f.frms
		*

drivers/staging/qcacld-3.0/core/mac/src/pe/lim/lim_assoc_utils.c

+47 −45

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2021 The Linux Foundation. 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
		@@ -1653,9 +1653,9 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
		{
		tSirMacRateSet tempRateSet;
		tSirMacRateSet tempRateSet2;
		uint32_t i, j, val, min, isArate;

		isArate = 0;
		uint32_t i, j, val, min, isArate = 0;
		uint8_t aRateIndex = 0;
		uint8_t bRateIndex = 0;

		/* copy operational rate set from psessionEntry */
		if (psessionEntry->rateSet.numRates <= SIR_MAC_RATESET_EID_MAX) {
		@@ -1700,52 +1700,54 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
		* Sort rates in tempRateSet (they are likely to be already sorted)
		* put the result in pSupportedRates
		*/
		{
		uint8_t aRateIndex = 0;
		uint8_t bRateIndex = 0;

		qdf_mem_set((uint8_t *) pRates, sizeof(tSirSupportedRates), 0);
		qdf_mem_zero(pRates, sizeof(*pRates));
		for (i = 0; i < tempRateSet.numRates; i++) {
		min = 0;
		val = 0xff;
		isArate = 0;
		for (j = 0;
		(j < tempRateSet.numRates)
		&& (j < SIR_MAC_RATESET_EID_MAX); j++) {
		for (j = 0; (j < tempRateSet.numRates) &&
		(j < SIR_MAC_MAX_NUMBER_OF_RATES); j++) {
		if ((uint32_t)(tempRateSet.rate[j] & 0x7f) <
		val) {
		val = tempRateSet.rate[j] & 0x7f;
		min = j;
		}
		}
		if (sirIsArate(tempRateSet.rate[min] & 0x7f))
		if (sirIsArate(tempRateSet.rate[min] & 0x7f)) {
		isArate = 1;
		} else if (sirIsBrate(tempRateSet.rate[min] & 0x7f)) {
		isArate = 0;
		} else {
		pe_debug("%d is neither 11a nor 11b rate",
		tempRateSet.rate[min]);
		tempRateSet.rate[min] = 0xff;
		continue;
		}
		if (tempRateSet.rate[min] == pRates->llaRates[aRateIndex] \|\|
		tempRateSet.rate[min] == pRates->llbRates[bRateIndex]) {
		pe_debug("Duplicate rate: %d", tempRateSet.rate[min]);
		tempRateSet.rate[min] = 0xff;
		continue;
		}
		/*
		* HAL needs to know whether the rate is basic rate or not, as it needs to
		* update the response rate table accordingly. e.g. if one of the 11a rates is
		* basic rate, then that rate can be used for sending control frames.
		* HAL updates the response rate table whenever basic rate set is changed.
		* HAL needs to know whether the rate is basic rate or not,
		* as it needs to update the response rate table accordingly.
		* e.g. if one of the 11a rates is basic rate, then that rate
		* can be used for sending control frames. HAL updates the
		* response rate table whenever basic rate set is changed.
		*/
		if (basicOnly) {
		if (tempRateSet.rate[min] & 0x80) {
		if (isArate)
		pRates->llaRates[aRateIndex++] =
		tempRateSet.rate[min];
		else
		pRates->llbRates[bRateIndex++] =
		tempRateSet.rate[min];
		if (basicOnly && !(tempRateSet.rate[min] & 0x80)) {
		tempRateSet.rate[min] = 0xff;
		continue;
		}
		} else {
		if (isArate)
		if (isArate && aRateIndex < SIR_NUM_11A_RATES)
		pRates->llaRates[aRateIndex++] =
		tempRateSet.rate[min];
		else
		else if (bRateIndex < SIR_NUM_11B_RATES)
		pRates->llbRates[bRateIndex++] =
		tempRateSet.rate[min];
		}
		tempRateSet.rate[min] = 0xff;
		}
		}

		if (IS_DOT11_MODE_HT(psessionEntry->dot11mode)) {
		val = SIZE_OF_SUPPORTED_MCS_SET;

drivers/staging/qcacld-3.0/core/mac/src/pe/sch/sch_beacon_gen.c

+5 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2018, 2021 The Linux Foundation. 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 +156,7 @@ sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session,

		/**
		* sch_get_csa_ecsa_count_offset() - get the offset of Switch count field
		* @ie: pointer to the beggining of IEs in the beacon frame buffer
		* @ie: pointer to the beginning of IEs in the beacon frame buffer
		* @ie_len: length of the IEs in the buffer
		* @csa_count_offset: pointer to the csa_count_offset variable in the caller
		* @ecsa_count_offset: pointer to the ecsa_count_offset variable in the caller
		@@ -195,6 +195,9 @@ static void sch_get_csa_ecsa_count_offset(uint8_t *ie, uint32_t ie_len,
		*ecsa_count_offset = offset +
		SCH_ECSA_SWITCH_COUNT_OFFSET;

		if (ie_len < elem_len)
		return;

		ie_len -= elem_len;
		offset += elem_len;
		ptr += (elem_len + 2);

drivers/staging/qcacld-3.0/core/mac/src/sys/legacy/src/utils/src/dot11f.c

+14 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019, 2021 The Linux Foundation. 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
		@@ -24,7 +24,7 @@
		*
		*
		* This file was automatically generated by 'framesc'
		* Mon Mar 25 14:48:07 2019 from the following file(s):
		* Wed Sep 29 13:23:21 2021 from the following file(s):
		*
		* dot11f.frms
		*
		@@ -335,7 +335,7 @@ static uint32_t get_container_ies_len(tpAniSirGlobal pCtx,
		len += *(pBufRemaining+1);
		pBufRemaining += len + 2;
		len += 2;
		while (len < nBuf) {
		while (len + 1 < nBuf) {
		pIe = find_ie_defn(pCtx, pBufRemaining, nBuf - len, IEs);
		if (NULL == pIe)
		break;
		@@ -13659,7 +13659,6 @@ static uint32_t unpack_tlv_core(tpAniSirGlobal pCtx,
		}
		/* & length, */
		if (pTlv->sLen == 2) {
		framesntohs(pCtx, &len, pBufRemaining, pTlv->fMsb);
		if (2 > nBufRemaining) {
		FRAMES_LOG0(pCtx, FRLOGE, FRFL("This frame reports "
		"fewer two byte(s) remaining.\n"));
		@@ -13667,6 +13666,7 @@ static uint32_t unpack_tlv_core(tpAniSirGlobal pCtx,
		FRAMES_DBG_BREAK();
		goto MandatoryCheck;
		}
		framesntohs(pCtx, &len, pBufRemaining, pTlv->fMsb);
		pBufRemaining += 2;
		nBufRemaining -= 2;
		} else {
		@@ -13675,9 +13675,14 @@ static uint32_t unpack_tlv_core(tpAniSirGlobal pCtx,
		nBufRemaining -= 1;
		}
		} else {
		if (TLVs[0].sType > nBufRemaining) {
		FRAMES_LOG0(pCtx, FRLOGE, FRFL("This frame reports "
		"fewer LVs[0].sType byte(s) remaining.\n"));
		status \|= DOT11F_INCOMPLETE_TLV;
		goto MandatoryCheck;
		}
		pBufRemaining += TLVs[0].sType;
		nBufRemaining -= TLVs[0].sType;
		framesntohs(pCtx, &len, pBufRemaining, (TLVs[0].sType == 2));
		if (2 > nBufRemaining) {
		FRAMES_LOG0(pCtx, FRLOGE, FRFL("This frame reports "
		"fewer two byte(s) remaining.\n"));
		@@ -13685,6 +13690,7 @@ static uint32_t unpack_tlv_core(tpAniSirGlobal pCtx,
		FRAMES_DBG_BREAK();
		goto MandatoryCheck;
		}
		framesntohs(pCtx, &len, pBufRemaining, (TLVs[0].sType == 2));
		pBufRemaining += 2;
		nBufRemaining -= 2;
		}