aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/sta_ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rt2860/sta_ioctl.c')
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index e095a44cbc0..5717e12a954 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -31,10 +31,11 @@
31 IOCTL related subroutines 31 IOCTL related subroutines
32 32
33 Revision History: 33 Revision History:
34 Who When What 34 Who When What
35 -------- ---------- ---------------------------------------------- 35 -------- ---------- ----------------------------------------------
36 Rory Chen 01-03-2003 created 36 Rory Chen 01-03-2003 created
37 Rory Chen 02-14-2005 modify to support RT61 37 Rory Chen 02-14-2005 modify to support RT61
38 Justin P. Mattock 11/07/2010 Fix typos
38*/ 39*/
39 40
40#include "rt_config.h" 41#include "rt_config.h"
@@ -851,7 +852,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
851 852
852 /* 853 /*
853 Protocol: 854 Protocol:
854 it will show scanned AP's WirelessMode . 855 it will show scanned AP's WirelessMode.
855 it might be 856 it might be
856 802.11a 857 802.11a
857 802.11a/n 858 802.11a/n
@@ -875,13 +876,13 @@ int rt_ioctl_giwscan(struct net_device *dev,
875 strcpy(iwe.u.name, "802.11a"); 876 strcpy(iwe.u.name, "802.11a");
876 } else { 877 } else {
877 /* 878 /*
878 if one of non B mode rate is set supported rate . it mean G only. 879 if one of non B mode rate is set supported rate, it means G only.
879 */ 880 */
880 for (rateCnt = 0; 881 for (rateCnt = 0;
881 rateCnt < pBssEntry->SupRateLen; 882 rateCnt < pBssEntry->SupRateLen;
882 rateCnt++) { 883 rateCnt++) {
883 /* 884 /*
884 6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate , it mean G only. 885 6Mbps(140) 9Mbps(146) and >=12Mbps(152) are supported rate, it means G only.
885 */ 886 */
886 if (pBssEntry->SupRate[rateCnt] == 140 887 if (pBssEntry->SupRate[rateCnt] == 140
887 || pBssEntry->SupRate[rateCnt] == 888 || pBssEntry->SupRate[rateCnt] ==
@@ -1417,7 +1418,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
1417 if ((index >= 0) && (index < 4)) { 1418 if ((index >= 0) && (index < 4)) {
1418 pAdapter->StaCfg.DefaultKeyId = index; 1419 pAdapter->StaCfg.DefaultKeyId = index;
1419 } else 1420 } else
1420 /* Don't complain if only change the mode */ 1421 /* Don't complain if the mode is only changed */
1421 if (!(erq->flags & IW_ENCODE_MODE)) 1422 if (!(erq->flags & IW_ENCODE_MODE))
1422 return -EINVAL; 1423 return -EINVAL;
1423 } 1424 }
@@ -2732,8 +2733,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
2732 } 2733 }
2733 if (INFRA_ON(pAdapter)) { 2734 if (INFRA_ON(pAdapter)) {
2734 /*BOOLEAN Cancelled; */ 2735 /*BOOLEAN Cancelled; */
2735 /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */ 2736 /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
2736 /* Since calling this indicate user don't want to connect to that SSID anymore. */ 2737 /* Since calling this indicates users don't want to connect to that SSID anymore. */
2737 pAdapter->MlmeAux.AutoReconnectSsidLen = 32; 2738 pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
2738 NdisZeroMemory(pAdapter->MlmeAux. 2739 NdisZeroMemory(pAdapter->MlmeAux.
2739 AutoReconnectSsid, 2740 AutoReconnectSsid,
@@ -2766,8 +2767,8 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
2766 LinkDown(pAdapter, FALSE); 2767 LinkDown(pAdapter, FALSE);
2767 } 2768 }
2768 if (ADHOC_ON(pAdapter)) { 2769 if (ADHOC_ON(pAdapter)) {
2769 /* Set the AutoReconnectSsid to prevent it reconnect to old SSID */ 2770 /* Set the AutoReconnectSsid to prevent it from reconnecting to the old SSID */
2770 /* Since calling this indicate user don't want to connect to that SSID anymore. */ 2771 /* Since calling this indicates users don't want to connect to that SSID anymore. */
2771 pAdapter->MlmeAux.AutoReconnectSsidLen = 32; 2772 pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
2772 NdisZeroMemory(pAdapter->MlmeAux. 2773 NdisZeroMemory(pAdapter->MlmeAux.
2773 AutoReconnectSsid, 2774 AutoReconnectSsid,
@@ -2884,7 +2885,7 @@ int Set_NetworkType_Proc(struct rt_rtmp_adapter *pAdapter, char *arg)
2884 } 2885 }
2885 /* Enable Rx with promiscuous reception */ 2886 /* Enable Rx with promiscuous reception */
2886 RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG, 0x3); 2887 RTMP_IO_WRITE32(pAdapter, RX_FILTR_CFG, 0x3);
2887 /* ASIC supporsts sniffer function with replacing RSSI with timestamp. */ 2888 /* ASIC supports sniffer function with replacing RSSI with timestamp. */
2888 /*RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value); */ 2889 /*RTMP_IO_READ32(pAdapter, MAC_SYS_CTRL, &Value); */
2889 /*Value |= (0x80); */ 2890 /*Value |= (0x80); */
2890 /*RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value); */ 2891 /*RTMP_IO_WRITE32(pAdapter, MAC_SYS_CTRL, Value); */