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 / auth.c

diff --git a/drivers/staging/rt2860/sta/auth.c b/drivers/staging/rt2860/sta/auth.c
index 404bd220679d3377a72b268b150b465421603218..23ea00b896b0ddae4ce33882301202d20a0f9852 100644 (file)
--- a/drivers/staging/rt2860/sta/auth.c
+++ b/drivers/staging/rt2860/sta/auth.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"
 
@@ -455,10 +456,10 @@ BOOLEAN AUTH_ReqSend(struct rt_rtmp_adapter *pAd,
        u8 *pOutBuffer = NULL;
        unsigned long FrameLen = 0, tmp = 0;
 
-       /* 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,
-                        ("%s - Block Auth request durning WPA block period!\n",
+                        ("%s - Block Auth request during WPA block period!\n",
                          pSMName));
                pAd->Mlme.AuthMachine.CurrState = AUTH_REQ_IDLE;
                Status = MLME_STATE_MACHINE_REJECT;
@@ -508,8 +509,7 @@ BOOLEAN AUTH_ReqSend(struct rt_rtmp_adapter *pAd,
                RTMPSetTimer(pAuthTimer, Timeout);
                return TRUE;
        } else {
-               DBGPRINT_ERR(("%s - MlmeAuthReqAction() sanity check failed\n",
-                             pSMName));
+               DBGPRINT_ERR("%s - MlmeAuthReqAction() sanity check failed\n", pSMName);
                return FALSE;
        }