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

diff --git a/drivers/staging/rt2860/sta/wpa.c b/drivers/staging/rt2860/sta/wpa.c
index 69b8a24daa21997aa3b3301b91dfd4f67613d223..ff348325028b8169f76db009fa6f2015e6864e0b 100644 (file)
--- a/drivers/staging/rt2860/sta/wpa.c
+++ b/drivers/staging/rt2860/sta/wpa.c
@@ -33,7 +33,8 @@
        Who                     When                    What
        --------        ----------              ----------------------------------------------
        Jan     Lee             03-07-22                Initial
-       Paul Lin        03-11-28                Modify for supplicant
+       Paul Lin                03-11-28                Modify for supplicant
+       Justin P. Mattock       11/07/2010              Fix typos
 */
 #include "../rt_config.h"
 
@@ -86,7 +87,7 @@ void RTMPReportMicError(struct rt_rtmp_adapter *pAd, struct rt_cipher_key *pWpaK
                        /* Violate MIC error counts, MIC countermeasures kicks in */
                        pAd->StaCfg.MicErrCnt++;
                        /* We shall block all reception */
-                       /* We shall clean all Tx ring and disassoicate from AP after next EAPOL frame */
+                       /* We shall clean all Tx ring and disassociate from AP after next EAPOL frame */
                        /* */
                        /* No necessary to clean all Tx ring, on RTMPHardTransmit will stop sending non-802.1X EAPOL packets */
                        /* if pAd->StaCfg.MicErrCnt greater than 2. */