Merge "prima: Send assoc reject upon failing to post ASSOC_IND" into wlan-driver.lnx.1.0 (91a33bed) · Commits · e / devices / android_kernel_fairphone_FP3

CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1677,7 +1677,7 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
		\param pMac
		\param *pStaDs - Station DPH hash entry
		\param psessionEntry - PE session entry
		\return None
		\return tSirRetStatus

		* ?????? How do I get
		* - subtype =====> psessionEntry->parsedAssocReq.reassocRequest
		@@ -1687,7 +1687,7 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
		* - pHdr->seqControl =====> no longer needed
		* - pStaDs
		------------------------------------------------------------------*/
		void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry)
		tSirRetStatus limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry)
		{
		tpLimMlmAssocInd pMlmAssocInd = NULL;
		tpLimMlmReassocInd pMlmReassocInd;
		@@ -1726,7 +1726,7 @@ void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession p
		{
		limReleasePeerIdx(pMac, pStaDs->assocId, psessionEntry);
		limLog(pMac, LOGP, FL("AllocateMemory failed for pMlmAssocInd"));
		return;
		return eSIR_MEM_ALLOC_FAILED;
		}
		vos_mem_set(pMlmAssocInd, temp ,0);

		@@ -1780,7 +1780,7 @@ void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession p
		PELOGE(limLog(pMac, LOGE, FL("rsnIEdata index out of bounds %d"),
		pMlmAssocInd->rsnIE.length);)
		vos_mem_free(pMlmAssocInd);
		return;
		return eSIR_FAILURE;
		}
		pMlmAssocInd->rsnIE.rsnIEdata[pMlmAssocInd->rsnIE.length] = SIR_MAC_WPA_EID;
		pMlmAssocInd->rsnIE.rsnIEdata[pMlmAssocInd->rsnIE.length + 1] = pAssocReq->wpa.length;
		@@ -1900,7 +1900,7 @@ void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession p
		limLog(pMac, LOGP, FL("call to AllocateMemory failed for "
		"pMlmReassocInd"));
		limReleasePeerIdx(pMac, pStaDs->assocId, psessionEntry);
		return;
		return eSIR_MEM_ALLOC_FAILED;
		}
		vos_mem_set(pMlmReassocInd, temp, 0);

		@@ -2024,6 +2024,6 @@ void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession p
		vos_mem_free(pMlmReassocInd);
		}

		return;
		return eSIR_SUCCESS;

		} /* end limSendMlmAssocInd() */

CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -2584,7 +2584,13 @@ void limProcessBtAmpApMlmAddStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPES
		* 2) PE receives eWNI_SME_ASSOC_CNF from SME
		* 3) BTAMP-AP sends Re/Association Response to BTAMP-STA
		*/
		limSendMlmAssocInd(pMac, pStaDs, psessionEntry);
		if (eSIR_SUCCESS != limSendMlmAssocInd(pMac, pStaDs, psessionEntry))
		limRejectAssociation(pMac, pStaDs->staAddr,
		pStaDs->mlmStaContext.subType,
		true, pStaDs->mlmStaContext.authType,
		pStaDs->assocId, true,
		(tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS,
		psessionEntry);
		// fall though to reclaim the original Add STA Response message
		end:
		if( 0 != limMsgQ->bodyptr )

CORE/MAC/src/pe/lim/limTypes.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -677,7 +677,7 @@ tSirRetStatus limProcessAuthFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *, void
		#endif

		void limProcessAssocReqFrame(tpAniSirGlobal, tANI_U8 *, tANI_U8, tpPESession);
		void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry);
		tSirRetStatus limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry);


		void limProcessAssocRspFrame(tpAniSirGlobal, tANI_U8 *, tANI_U8,tpPESession);