Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / sta / assoc.c

diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index b7efb0b6b3f095126b3fd78e8c7cb71398f0843a..59e931c3190d4a4ff827e0c9b34e9e369f77880d 100644 (file)
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -32,7 +32,8 @@
        Revision History:
        Who                     When                    What
        --------        ----------              ----------------------------------------------
-       John            2004-9-3                porting from RT2500
+       John                    2004-9-3                porting from RT2500
+       Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -277,10 +278,10 @@ void MlmeAssocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
        u16 VarIesOffset;
        u16 Status;
 
-       /* Block all authentication request durning WPA block period */
+       /* Block all authentication request during WPA block period */
        if (pAd->StaCfg.bBlockAssoc == TRUE) {
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("ASSOC - Block Assoc request durning WPA block period!\n"));
+                        ("ASSOC - Block Assoc request during WPA block period!\n"));
                pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
                Status = MLME_STATE_MACHINE_REJECT;
                MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2,
@@ -605,10 +606,10 @@ void MlmeReassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem
        u8 *pOutBuffer = NULL;
        u16 Status;
 
-       /* Block all authentication request durning WPA block period */
+       /* Block all authentication request during WPA block period */
        if (pAd->StaCfg.bBlockAssoc == TRUE) {
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("ASSOC - Block ReAssoc request durning WPA block period!\n"));
+                        ("ASSOC - Block ReAssoc request during WPA block period!\n"));
                pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE;
                Status = MLME_STATE_MACHINE_REJECT;
                MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2,
@@ -1001,7 +1002,7 @@ void AssocPostProc(struct rt_rtmp_adapter *pAd, u8 *pAddr2, u16 CapabilityInfo,
        pAd->MlmeAux.CapabilityInfo =
            CapabilityInfo & SUPPORTED_CAPABILITY_INFO;
 
-       /* Some HT AP might lost WMM IE. We add WMM ourselves. beacuase HT requires QoS on. */
+       /* Some HT AP might lost WMM IE. We add WMM ourselves. because HT requires QoS on. */
        if ((HtCapabilityLen > 0) && (pEdcaParm->bValid == FALSE)) {
                pEdcaParm->bValid = TRUE;
                pEdcaParm->Aifsn[0] = 3;
@@ -1054,7 +1055,7 @@ void AssocPostProc(struct rt_rtmp_adapter *pAd, u8 *pAddr2, u16 CapabilityInfo,
        /* Set New WPA information */
        Idx = BssTableSearch(&pAd->ScanTab, pAddr2, pAd->MlmeAux.Channel);
        if (Idx == BSS_NOT_FOUND) {
-               DBGPRINT_ERR(("ASSOC - Can't find BSS after receiving Assoc response\n"));
+               DBGPRINT_ERR("ASSOC - Can't find BSS after receiving Assoc response\n");
        } else {
                /* Init variable */
                pAd->MacTab.Content[BSSID_WCID].RSNIE_Len = 0;