diff options
Diffstat (limited to 'drivers/staging/rt2860/sta/assoc.c')
| -rw-r--r-- | drivers/staging/rt2860/sta/assoc.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c index a0734c65bc2f..1a587153c75e 100644 --- a/drivers/staging/rt2860/sta/assoc.c +++ b/drivers/staging/rt2860/sta/assoc.c @@ -454,11 +454,7 @@ VOID MlmeAssocReqAction( RSNIe = IE_WPA2; } -#ifdef RT30xx -#ifdef SIOCSIWGENIE if (pAd->StaCfg.WpaSupplicantUP != 1) -#endif // SIOCSIWGENIE // -#endif RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, BSS0); // Check for WPA PMK cache list @@ -485,8 +481,6 @@ VOID MlmeAssocReqAction( } } -#ifdef RT30xx -#ifdef SIOCSIWGENIE if (pAd->StaCfg.WpaSupplicantUP == 1) { MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, @@ -494,8 +488,6 @@ VOID MlmeAssocReqAction( END_OF_ARGS); } else -#endif -#endif { MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, 1, &RSNIe, @@ -506,11 +498,7 @@ VOID MlmeAssocReqAction( FrameLen += tmp; -#ifdef RT30xx -#ifdef SIOCSIWGENIE if (pAd->StaCfg.WpaSupplicantUP != 1) -#endif -#endif { // Append Variable IE NdisMoveMemory(pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe, 1); @@ -1503,7 +1491,6 @@ int wext_notify_event_assoc( union iwreq_data wrqu; char custom[IW_CUSTOM_MAX] = {0}; -#if WIRELESS_EXT > 17 if (pAd->StaCfg.ReqVarIELen <= IW_CUSTOM_MAX) { wrqu.data.length = pAd->StaCfg.ReqVarIELen; @@ -1512,19 +1499,6 @@ int wext_notify_event_assoc( } else DBGPRINT(RT_DEBUG_TRACE, ("pAd->StaCfg.ReqVarIELen > MAX_CUSTOM_LEN\n")); -#else - if (((pAd->StaCfg.ReqVarIELen*2) + 17) <= IW_CUSTOM_MAX) - { - UCHAR idx; - wrqu.data.length = (pAd->StaCfg.ReqVarIELen*2) + 17; - sprintf(custom, "ASSOCINFO(ReqIEs="); - for (idx=0; idx<pAd->StaCfg.ReqVarIELen; idx++) - sprintf(custom + strlen(custom), "%02x", pAd->StaCfg.ReqVarIEs[idx]); - wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, custom); - } - else - DBGPRINT(RT_DEBUG_TRACE, ("(pAd->StaCfg.ReqVarIELen*2) + 17 > MAX_CUSTOM_LEN\n")); -#endif return 0; |