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>

diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index 689b0468141a5ef350da4b923cb87817772bc62e..1a587153c75ea5055eed4cf55eb0811f9983c892 100644 (file)
--- 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);