UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Bartlomiej Zolnierkiewicz 2009-08-23 15:31:09 +02:00 committed by Greg Kroah-Hartman
parent 7e514725c8
commit a0f2906f33
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rt2860/sta/assoc.c
View File

@ -454,9 +454,7 @@ VOID MlmeAssocReqAction(
RSNIe = IE_WPA2; RSNIe = IE_WPA2;
} }
#ifdef RT30xx
if (pAd->StaCfg.WpaSupplicantUP != 1) if (pAd->StaCfg.WpaSupplicantUP != 1)
#endif
RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0); RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0);
// Check for WPA PMK cache list // Check for WPA PMK cache list
@ -483,7 +481,6 @@ VOID MlmeAssocReqAction(
} }
} }
#ifdef RT30xx
if (pAd->StaCfg.WpaSupplicantUP == 1) if (pAd->StaCfg.WpaSupplicantUP == 1)
{ {
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
@ -491,7 +488,6 @@ VOID MlmeAssocReqAction(
END_OF_ARGS); END_OF_ARGS);
} }
else else
#endif
{ {
MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
1, &RSNIe, 1, &RSNIe,
@ -502,9 +498,7 @@ VOID MlmeAssocReqAction(
FrameLen += tmp; FrameLen += tmp;
#ifdef RT30xx
if (pAd->StaCfg.WpaSupplicantUP != 1) if (pAd->StaCfg.WpaSupplicantUP != 1)
#endif
{ {
// Append Variable IE // Append Variable IE
NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1); NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1);