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

Commit a0f2906f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: MlmeAssocReqAction() fixes for wpa_supplicant support 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7e514725

drivers/staging/rt2860/sta/assoc.c

+0 −6
Original line number Diff line number Diff line
@@ -454,9 +454,7 @@ VOID MlmeAssocReqAction( 
				RSNIe = IE_WPA2;

			}



#ifdef RT30xx

			if (pAd->StaCfg.WpaSupplicantUP != 1)

#endif

            RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0);



            // Check for WPA PMK cache list
@@ -483,7 +481,6 @@ VOID MlmeAssocReqAction( 
				}

			}



#ifdef RT30xx

			if (pAd->StaCfg.WpaSupplicantUP == 1)

			{

				MakeOutgoingFrame(pOutBuffer + FrameLen,    		&tmp,
@@ -491,7 +488,6 @@ VOID MlmeAssocReqAction( 
		                        	END_OF_ARGS);

			}

			else

#endif

			{

				MakeOutgoingFrame(pOutBuffer + FrameLen,    		&tmp,

				              		1,                              &RSNIe,
@@ -502,9 +498,7 @@ VOID MlmeAssocReqAction( 


			FrameLen += tmp;



#ifdef RT30xx

			if (pAd->StaCfg.WpaSupplicantUP != 1)

#endif

			{

	            // Append Variable IE

	            NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1);