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

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
...@@ -454,9 +454,7 @@ VOID MlmeAssocReqAction( ...@@ -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( ...@@ -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( ...@@ -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( ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment