mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
Staging: rt28x0: MlmeAssocReqAction() fixes for wpa_supplicant support
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7e514725c8
commit
a0f2906f33
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user