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_ioctl.c

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index e095a44cbc0ec185d6f7c6a2dbc51a7ab8c86a65..5717e12a954451612fe9fdeee7f5fe018841085c 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -31,10 +31,11 @@
     IOCTL related subroutines
 
     Revision History:
-    Who         When          What
+       Who                      When          What
     --------    ----------    ----------------------------------------------
-    Rory Chen   01-03-2003    created
-       Rory Chen   02-14-2005    modify to support RT61
+       Rory Chen               01-03-2003      created
+       Rory Chen               02-14-2005      modify to support RT61
+       Justin P. Mattock       11/07/2010      Fix typos
 */
 
 #include       "rt_config.h"
@@ -851,7 +852,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
 
                /*
                   Protocol:
-                  it will show scanned AP's WirelessMode .
+                  it will show scanned AP's WirelessMode.
                   it might be
                   802.11a
                   802.11a/n
@@ -875,13 +876,13 @@ int rt_ioctl_giwscan(struct net_device *dev,
                                        strcpy(iwe.u.name, "802.11a");
                        } else {
                                /*
-                                  if one of non B mode rate is set supported rate . it mean G only.
+                                  if one of non B mode rate is set supported rate, it means G only.
                                 */
                                for (rateCnt = 0;
                                     rateCnt < pBssEntry->SupRateLen;
                                     rateCnt++) {
                                        /*
-                                          6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate , it mean G only.
+                                          6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate, it means G only.
                                         */
                                        if (pBssEntry->SupRate[rateCnt] == 140
                                            || pBssEntry->SupRate[rateCnt] ==
@@ -1417,7 +1418,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
                if ((index >= 0) && (index < 4)) {
                        pAdapter->StaCfg.DefaultKeyId = index;
                } else
-                       /* Don't complain if only change the mode */
+                       /* Don't complain if the mode is only changed */
                if (!(erq->flags & IW_ENCODE_MODE))
                        return -EINVAL;
        }
@@ -2732,8 +2733,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                        }
                        if (INFRA_ON(pAdapter)) {
                                /*BOOLEAN Cancelled; */
-                               /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
-                               /* Since calling this indicate user don't want to connect to that SSID anymore. */
+                               /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
+                               /* Since calling this indicates users don't want to connect to that SSID anymore. */
                                pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
                                NdisZeroMemory(pAdapter->MlmeAux.
                                               AutoReconnectSsid,
@@ -2766,8 +2767,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                                LinkDown(pAdapter, FALSE);
                        }
                        if (ADHOC_ON(pAdapter)) {
-                               /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */
-                               /* Since calling this indicate user don't want to connect to that SSID anymore. */
+                               /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
+                               /* Since calling this indicates users don't want to connect to that SSID anymore. */
                                pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
                                NdisZeroMemory(pAdapter->MlmeAux.
                                               AutoReconnectSsid,
@@ -2884,7 +2885,7 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
                }
                /* Enable Rx with promiscuous reception */
                RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG, 0x3);
-               /* ASIC supporsts sniffer function with replacing RSSI with timestamp. */
+               /* ASIC supports sniffer function with replacing RSSI with timestamp. */
                /*RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value); */
                /*Value |= (0x80); */
                /*RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value); */