aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2870
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 10:05:17 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:44 -0400
commit7920e2647e6297925a2541994e8233fdca73fbee (patch)
tree7a68c764f5c27f927ffdebf6d80dfe84ceb3f3e3 /drivers/staging/rt2870
parent37f9be32f71aa7cd2556b7036cdcada350a3b80d (diff)
Staging: rt2870: remove dead SNMP_SUPPORT code
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2870')
-rw-r--r--drivers/staging/rt2870/oid.h25
-rw-r--r--drivers/staging/rt2870/rtmp.h14
-rw-r--r--drivers/staging/rt2870/rtmp_def.h9
-rw-r--r--drivers/staging/rt2870/sta_ioctl.c226
4 files changed, 0 insertions, 274 deletions
diff --git a/drivers/staging/rt2870/oid.h b/drivers/staging/rt2870/oid.h
index 5d879d1eef7..37e598be374 100644
--- a/drivers/staging/rt2870/oid.h
+++ b/drivers/staging/rt2870/oid.h
@@ -685,31 +685,6 @@ enum {
685 685
686#endif // CONFIG_STA_SUPPORT // 686#endif // CONFIG_STA_SUPPORT //
687 687
688#ifdef SNMP_SUPPORT
689//SNMP ieee 802dot11, kathy , 2008_0220
690// dot11res(3)
691#define RT_OID_802_11_MANUFACTUREROUI 0x0700
692#define RT_OID_802_11_MANUFACTURERNAME 0x0701
693#define RT_OID_802_11_RESOURCETYPEIDNAME 0x0702
694
695// dot11smt(1)
696#define RT_OID_802_11_PRIVACYOPTIONIMPLEMENTED 0x0703
697#define RT_OID_802_11_POWERMANAGEMENTMODE 0x0704
698#define OID_802_11_WEPDEFAULTKEYVALUE 0x0705 // read , write
699#define OID_802_11_WEPDEFAULTKEYID 0x0706
700#define RT_OID_802_11_WEPKEYMAPPINGLENGTH 0x0707
701#define OID_802_11_SHORTRETRYLIMIT 0x0708
702#define OID_802_11_LONGRETRYLIMIT 0x0709
703#define RT_OID_802_11_PRODUCTID 0x0710
704#define RT_OID_802_11_MANUFACTUREID 0x0711
705
706// //dot11Phy(4)
707#define OID_802_11_CURRENTCHANNEL 0x0712
708
709//dot11mac
710#define RT_OID_802_11_MAC_ADDRESS 0x0713
711#endif // SNMP_SUPPORT //
712
713#define OID_802_11_BUILD_CHANNEL_EX 0x0714 688#define OID_802_11_BUILD_CHANNEL_EX 0x0714
714#define OID_802_11_GET_CH_LIST 0x0715 689#define OID_802_11_GET_CH_LIST 0x0715
715#define OID_802_11_GET_COUNTRY_CODE 0x0716 690#define OID_802_11_GET_COUNTRY_CODE 0x0716
diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index dd3b4eafe6c..eb829a124d7 100644
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -6505,20 +6505,6 @@ PNDIS_PACKET RTMPDeFragmentDataFrame(
6505 6505
6506//////////////////////////////////////// 6506////////////////////////////////////////
6507 6507
6508
6509
6510
6511
6512#ifdef SNMP_SUPPORT
6513//for snmp , kathy
6514typedef struct _DefaultKeyIdxValue
6515{
6516 UCHAR KeyIdx;
6517 UCHAR Value[16];
6518} DefaultKeyIdxValue, *PDefaultKeyIdxValue;
6519#endif
6520
6521
6522#ifdef CONFIG_STA_SUPPORT 6508#ifdef CONFIG_STA_SUPPORT
6523enum { 6509enum {
6524 DIDmsg_lnxind_wlansniffrm = 0x00000044, 6510 DIDmsg_lnxind_wlansniffrm = 0x00000044,
diff --git a/drivers/staging/rt2870/rtmp_def.h b/drivers/staging/rt2870/rtmp_def.h
index 221919a7e23..d0c439e7861 100644
--- a/drivers/staging/rt2870/rtmp_def.h
+++ b/drivers/staging/rt2870/rtmp_def.h
@@ -54,15 +54,6 @@
54#define NIC_TAG ((ULONG)'0682') 54#define NIC_TAG ((ULONG)'0682')
55#define NIC_DBG_STRING ("**RT28xx**") 55#define NIC_DBG_STRING ("**RT28xx**")
56 56
57#ifdef SNMP_SUPPORT
58// for snmp
59// to get manufacturer OUI, kathy, 2008_0220
60#define ManufacturerOUI_LEN 3
61#define ManufacturerNAME ("Ralink Technology Company.")
62#define ResourceTypeIdName ("Ralink_ID")
63#endif
64
65
66//#define PACKED 57//#define PACKED
67 58
68#define RALINK_2883_VERSION ((UINT32)0x28830300) 59#define RALINK_2883_VERSION ((UINT32)0x28830300)
diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 3921dbee0d3..c05ae3a33e6 100644
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -3149,14 +3149,6 @@ INT RTMPSetInformation(
3149 UCHAR wpa_supplicant_enable = 0; 3149 UCHAR wpa_supplicant_enable = 0;
3150#endif // WPA_SUPPLICANT_SUPPORT // 3150#endif // WPA_SUPPLICANT_SUPPORT //
3151 3151
3152#ifdef SNMP_SUPPORT
3153 TX_RTY_CFG_STRUC tx_rty_cfg;
3154 ULONG ShortRetryLimit, LongRetryLimit;
3155 UCHAR ctmp;
3156#endif // SNMP_SUPPORT //
3157
3158
3159
3160#ifdef DOT11_N_SUPPORT 3152#ifdef DOT11_N_SUPPORT
3161 MaxPhyMode = PHY_11N_5G; 3153 MaxPhyMode = PHY_11N_5G;
3162#endif // DOT11_N_SUPPORT // 3154#endif // DOT11_N_SUPPORT //
@@ -4286,93 +4278,6 @@ INT RTMPSetInformation(
4286 break; 4278 break;
4287#endif // WPA_SUPPLICANT_SUPPORT // 4279#endif // WPA_SUPPLICANT_SUPPORT //
4288 4280
4289
4290
4291#ifdef SNMP_SUPPORT
4292 case OID_802_11_SHORTRETRYLIMIT:
4293 if (wrq->u.data.length != sizeof(ULONG))
4294 Status = -EINVAL;
4295 else
4296 {
4297 Status = copy_from_user(&ShortRetryLimit, wrq->u.data.pointer, wrq->u.data.length);
4298 RTMP_IO_READ32(pAdapter, TX_RTY_CFG, &tx_rty_cfg.word);
4299 tx_rty_cfg.field.ShortRtyLimit = ShortRetryLimit;
4300 RTMP_IO_WRITE32(pAdapter, TX_RTY_CFG, tx_rty_cfg.word);
4301 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_SHORTRETRYLIMIT (tx_rty_cfg.field.ShortRetryLimit=%d, ShortRetryLimit=%ld)\n", tx_rty_cfg.field.ShortRtyLimit, ShortRetryLimit));
4302 }
4303 break;
4304
4305 case OID_802_11_LONGRETRYLIMIT:
4306 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_LONGRETRYLIMIT \n"));
4307 if (wrq->u.data.length != sizeof(ULONG))
4308 Status = -EINVAL;
4309 else
4310 {
4311 Status = copy_from_user(&LongRetryLimit, wrq->u.data.pointer, wrq->u.data.length);
4312 RTMP_IO_READ32(pAdapter, TX_RTY_CFG, &tx_rty_cfg.word);
4313 tx_rty_cfg.field.LongRtyLimit = LongRetryLimit;
4314 RTMP_IO_WRITE32(pAdapter, TX_RTY_CFG, tx_rty_cfg.word);
4315 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_LONGRETRYLIMIT (tx_rty_cfg.field.LongRetryLimit= %d,LongRetryLimit=%ld)\n", tx_rty_cfg.field.LongRtyLimit, LongRetryLimit));
4316 }
4317 break;
4318
4319 case OID_802_11_WEPDEFAULTKEYVALUE:
4320 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_WEPDEFAULTKEYVALUE\n"));
4321 pKey = kmalloc(wrq->u.data.length, GFP_KERNEL);
4322 Status = copy_from_user(pKey, wrq->u.data.pointer, wrq->u.data.length);
4323 //pKey = &WepKey;
4324
4325 if ( pKey->Length != wrq->u.data.length)
4326 {
4327 Status = -EINVAL;
4328 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_WEPDEFAULTKEYVALUE, Failed!!\n"));
4329 }
4330 KeyIdx = pKey->KeyIndex & 0x0fffffff;
4331 DBGPRINT(RT_DEBUG_TRACE,("pKey->KeyIndex =%d, pKey->KeyLength=%d\n", pKey->KeyIndex, pKey->KeyLength));
4332
4333 // it is a shared key
4334 if (KeyIdx > 4)
4335 Status = -EINVAL;
4336 else
4337 {
4338 pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].KeyLen = (UCHAR) pKey->KeyLength;
4339 NdisMoveMemory(&pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].Key, &pKey->KeyMaterial, pKey->KeyLength);
4340 if (pKey->KeyIndex & 0x80000000)
4341 {
4342 // Default key for tx (shared key)
4343 pAdapter->StaCfg.DefaultKeyId = (UCHAR) KeyIdx;
4344 }
4345 //RestartAPIsRequired = TRUE;
4346 }
4347 break;
4348
4349
4350 case OID_802_11_WEPDEFAULTKEYID:
4351 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_WEPDEFAULTKEYID \n"));
4352
4353 if (wrq->u.data.length != sizeof(UCHAR))
4354 Status = -EINVAL;
4355 else
4356 Status = copy_from_user(&pAdapter->StaCfg.DefaultKeyId, wrq->u.data.pointer, wrq->u.data.length);
4357
4358 break;
4359
4360
4361 case OID_802_11_CURRENTCHANNEL:
4362 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_CURRENTCHANNEL \n"));
4363 if (wrq->u.data.length != sizeof(UCHAR))
4364 Status = -EINVAL;
4365 else
4366 {
4367 Status = copy_from_user(&ctmp, wrq->u.data.pointer, wrq->u.data.length);
4368 sprintf(&ctmp,"%d", ctmp);
4369 Set_Channel_Proc(pAdapter, &ctmp);
4370 }
4371 break;
4372#endif
4373
4374
4375
4376 default: 4281 default:
4377 DBGPRINT(RT_DEBUG_TRACE, ("Set::unknown IOCTL's subcmd = 0x%08x\n", cmd)); 4282 DBGPRINT(RT_DEBUG_TRACE, ("Set::unknown IOCTL's subcmd = 0x%08x\n", cmd));
4378 Status = -EOPNOTSUPP; 4283 Status = -EOPNOTSUPP;
@@ -4414,16 +4319,6 @@ INT RTMPQueryInformation(
4414 UCHAR driverVersion[8]; 4319 UCHAR driverVersion[8];
4415 OID_SET_HT_PHYMODE *pHTPhyMode = NULL; 4320 OID_SET_HT_PHYMODE *pHTPhyMode = NULL;
4416 4321
4417
4418#ifdef SNMP_SUPPORT
4419 //for snmp, kathy
4420 DefaultKeyIdxValue *pKeyIdxValue;
4421 INT valueLen;
4422 TX_RTY_CFG_STRUC tx_rty_cfg;
4423 ULONG ShortRetryLimit, LongRetryLimit;
4424 UCHAR tmp[64];
4425#endif //SNMP
4426
4427 switch(cmd) 4322 switch(cmd)
4428 { 4323 {
4429 case RT_OID_DEVICE_NAME: 4324 case RT_OID_DEVICE_NAME:
@@ -5014,127 +4909,6 @@ INT RTMPQueryInformation(
5014 } 4909 }
5015 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_QUERY_MULTIPLE_CARD_SUPPORT(=%d) \n", i)); 4910 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_QUERY_MULTIPLE_CARD_SUPPORT(=%d) \n", i));
5016 break; 4911 break;
5017#ifdef SNMP_SUPPORT
5018 case RT_OID_802_11_MAC_ADDRESS:
5019 wrq->u.data.length = MAC_ADDR_LEN;
5020 Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CurrentAddress, wrq->u.data.length);
5021 break;
5022
5023 case RT_OID_802_11_MANUFACTUREROUI:
5024 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_MANUFACTUREROUI \n"));
5025 wrq->u.data.length = ManufacturerOUI_LEN;
5026 Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CurrentAddress, wrq->u.data.length);
5027 break;
5028
5029 case RT_OID_802_11_MANUFACTURERNAME:
5030 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_MANUFACTURERNAME \n"));
5031 wrq->u.data.length = strlen(ManufacturerNAME);
5032 Status = copy_to_user(wrq->u.data.pointer, ManufacturerNAME, wrq->u.data.length);
5033 break;
5034
5035 case RT_OID_802_11_RESOURCETYPEIDNAME:
5036 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_RESOURCETYPEIDNAME \n"));
5037 wrq->u.data.length = strlen(ResourceTypeIdName);
5038 Status = copy_to_user(wrq->u.data.pointer, ResourceTypeIdName, wrq->u.data.length);
5039 break;
5040
5041 case RT_OID_802_11_PRIVACYOPTIONIMPLEMENTED:
5042 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_PRIVACYOPTIONIMPLEMENTED \n"));
5043 ulInfo = 1; // 1 is support wep else 2 is not support.
5044 wrq->u.data.length = sizeof(ulInfo);
5045 Status = copy_to_user(wrq->u.data.pointer, &ulInfo, wrq->u.data.length);
5046 break;
5047
5048 case RT_OID_802_11_POWERMANAGEMENTMODE:
5049 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_POWERMANAGEMENTMODE \n"));
5050 if (pAdapter->StaCfg.Psm == PSMP_ACTION)
5051 ulInfo = 1; // 1 is power active else 2 is power save.
5052 else
5053 ulInfo = 2;
5054
5055 wrq->u.data.length = sizeof(ulInfo);
5056 Status = copy_to_user(wrq->u.data.pointer, &ulInfo, wrq->u.data.length);
5057 break;
5058
5059 case OID_802_11_WEPDEFAULTKEYVALUE:
5060 DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_WEPDEFAULTKEYVALUE \n"));
5061 //KeyIdxValue.KeyIdx = pAd->PortCfg.MBSSID[pAd->IoctlIF].DefaultKeyId;
5062 pKeyIdxValue = wrq->u.data.pointer;
5063 DBGPRINT(RT_DEBUG_TRACE,("KeyIdxValue.KeyIdx = %d, \n",pKeyIdxValue->KeyIdx));
5064 valueLen = pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].KeyLen;
5065 NdisMoveMemory(pKeyIdxValue->Value,
5066 &pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].Key,
5067 valueLen);
5068 pKeyIdxValue->Value[valueLen]='\0';
5069
5070 wrq->u.data.length = sizeof(DefaultKeyIdxValue);
5071
5072 Status = copy_to_user(wrq->u.data.pointer, pKeyIdxValue, wrq->u.data.length);
5073 DBGPRINT(RT_DEBUG_TRACE,("DefaultKeyId = %d, total len = %d, str len=%d, KeyValue= %02x %02x %02x %02x \n", pAdapter->StaCfg.DefaultKeyId, wrq->u.data.length, pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].KeyLen,
5074 pAdapter->SharedKey[BSS0][0].Key[0],
5075 pAdapter->SharedKey[BSS0][1].Key[0],
5076 pAdapter->SharedKey[BSS0][2].Key[0],
5077 pAdapter->SharedKey[BSS0][3].Key[0]));
5078 break;
5079
5080 case OID_802_11_WEPDEFAULTKEYID:
5081 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_WEPDEFAULTKEYID \n"));
5082 wrq->u.data.length = sizeof(UCHAR);
5083 Status = copy_to_user(wrq->u.data.pointer, &pAdapter->StaCfg.DefaultKeyId, wrq->u.data.length);
5084 DBGPRINT(RT_DEBUG_TRACE, ("DefaultKeyId =%d \n", pAdapter->StaCfg.DefaultKeyId));
5085 break;
5086
5087 case RT_OID_802_11_WEPKEYMAPPINGLENGTH:
5088 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_WEPKEYMAPPINGLENGTH \n"));
5089 wrq->u.data.length = sizeof(UCHAR);
5090 Status = copy_to_user(wrq->u.data.pointer,
5091 &pAdapter->SharedKey[BSS0][pAdapter->StaCfg.DefaultKeyId].KeyLen,
5092 wrq->u.data.length);
5093 break;
5094
5095 case OID_802_11_SHORTRETRYLIMIT:
5096 DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_SHORTRETRYLIMIT \n"));
5097 wrq->u.data.length = sizeof(ULONG);
5098 RTMP_IO_READ32(pAdapter, TX_RTY_CFG, &tx_rty_cfg.word);
5099 ShortRetryLimit = tx_rty_cfg.field.ShortRtyLimit;
5100 DBGPRINT(RT_DEBUG_TRACE, ("ShortRetryLimit =%ld, tx_rty_cfg.field.ShortRetryLimit=%d\n", ShortRetryLimit, tx_rty_cfg.field.ShortRtyLimit));
5101 Status = copy_to_user(wrq->u.data.pointer, &ShortRetryLimit, wrq->u.data.length);
5102 break;
5103
5104 case OID_802_11_LONGRETRYLIMIT:
5105 DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_LONGRETRYLIMIT \n"));
5106 wrq->u.data.length = sizeof(ULONG);
5107 RTMP_IO_READ32(pAdapter, TX_RTY_CFG, &tx_rty_cfg.word);
5108 LongRetryLimit = tx_rty_cfg.field.LongRtyLimit;
5109 DBGPRINT(RT_DEBUG_TRACE, ("LongRetryLimit =%ld, tx_rty_cfg.field.LongRtyLimit=%d\n", LongRetryLimit, tx_rty_cfg.field.LongRtyLimit));
5110 Status = copy_to_user(wrq->u.data.pointer, &LongRetryLimit, wrq->u.data.length);
5111 break;
5112
5113 case RT_OID_802_11_PRODUCTID:
5114 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_PRODUCTID \n"));
5115
5116#ifdef RT2870
5117 sprintf(tmp, "%04x %04x\n", ((POS_COOKIE)pAdapter->OS_Cookie)->pUsb_Dev->descriptor.idVendor ,((POS_COOKIE)pAdapter->OS_Cookie)->pUsb_Dev->descriptor.idProduct);
5118
5119#endif // RT2870 //
5120 wrq->u.data.length = strlen(tmp);
5121 Status = copy_to_user(wrq->u.data.pointer, tmp, wrq->u.data.length);
5122 break;
5123
5124 case RT_OID_802_11_MANUFACTUREID:
5125 DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_MANUFACTUREID \n"));
5126 wrq->u.data.length = strlen(ManufacturerNAME);
5127 Status = copy_to_user(wrq->u.data.pointer, ManufacturerNAME, wrq->u.data.length);
5128 break;
5129
5130 case OID_802_11_CURRENTCHANNEL:
5131 DBGPRINT(RT_DEBUG_TRACE, ("Query::OID_802_11_CURRENTCHANNEL \n"));
5132 wrq->u.data.length = sizeof(UCHAR);
5133 DBGPRINT(RT_DEBUG_TRACE, ("sizeof UCHAR=%d, channel=%d \n", sizeof(UCHAR), pAdapter->CommonCfg.Channel));
5134 Status = copy_to_user(wrq->u.data.pointer, &pAdapter->CommonCfg.Channel, wrq->u.data.length);
5135 DBGPRINT(RT_DEBUG_TRACE, ("Status=%d\n", Status));
5136 break;
5137#endif //SNMP_SUPPORT
5138 4912
5139 case OID_802_11_BUILD_CHANNEL_EX: 4913 case OID_802_11_BUILD_CHANNEL_EX:
5140 { 4914 {
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 08:37:07 -0400