aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-08-23 15:31:09 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:22 -0700
commita0f2906f3385cfb84a6ec6b0c2c0c028dcc8cfde (patch)
tree059b3efcbad5223b3dfa6930491ad4cdfe270506
parent7e514725c8fe3128dee131a8d4ee23545c3e8c1f (diff)
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>
-rw-r--r--drivers/staging/rt2860/sta/assoc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index 689b0468141..1a587153c75 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -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);