aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 10:05:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:43 -0400
commit9ab6d90b80c446d961f4ab7ced8b6329dea4fe66 (patch)
tree431b4700ecacbb287bd066f6d48e94a7deef331c
parent72888d31af50c4e8c2732ffd557655444bf9c8a2 (diff)
Staging: rt2870: remove dead MULTIPLE_CARD_SUPPORT code
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/rt2870/2870_main_dev.c10
-rw-r--r--drivers/staging/rt2870/rt_linux.h3
-rw-r--r--drivers/staging/rt2870/rt_main_dev.c399
-rw-r--r--drivers/staging/rt2870/rt_profile.c3
-rw-r--r--drivers/staging/rt2870/rtmp.h5
-rw-r--r--drivers/staging/rt2870/rtmp_def.h5
-rw-r--r--drivers/staging/rt2870/sta_ioctl.c3
7 files changed, 0 insertions, 428 deletions
diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index aa8f1e185bd..21a40276f7b 100644
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -53,11 +53,6 @@ MODULE_VERSION(STA_DRIVER_VERSION);
53#endif 53#endif
54#endif // CONFIG_STA_SUPPORT // 54#endif // CONFIG_STA_SUPPORT //
55 55
56#ifdef MULTIPLE_CARD_SUPPORT
57// record whether the card in the card list is used in the card file
58extern UINT8 MC_CardUsed[];
59#endif // MULTIPLE_CARD_SUPPORT //
60
61/* Kernel thread and vars, which handles packets that are completed. Only 56/* Kernel thread and vars, which handles packets that are completed. Only
62 * packets that have a "complete" function are sent here. This way, the 57 * packets that have a "complete" function are sent here. This way, the
63 * completion is run out of kernel context, and doesn't block the rest of 58 * completion is run out of kernel context, and doesn't block the rest of
@@ -771,11 +766,6 @@ static void _rtusb_disconnect(struct usb_device *dev, PRTMP_ADAPTER pAd)
771 dev->bus->bus_name, dev->devpath)); 766 dev->bus->bus_name, dev->devpath));
772 if (!pAd) 767 if (!pAd)
773 { 768 {
774#ifdef MULTIPLE_CARD_SUPPORT
775 if ((pAd->MC_RowID >= 0) && (pAd->MC_RowID <= MAX_NUM_OF_MULTIPLE_CARD))
776 MC_CardUsed[pAd->MC_RowID] = 0; // not clear MAC address
777#endif // MULTIPLE_CARD_SUPPORT //
778
779 usb_put_dev(dev); 769 usb_put_dev(dev);
780 770
781 printk("rtusb_disconnect: pAd == NULL!\n"); 771 printk("rtusb_disconnect: pAd == NULL!\n");
diff --git a/drivers/staging/rt2870/rt_linux.h b/drivers/staging/rt2870/rt_linux.h
index 8870e4e8f2e..1ddd835882a 100644
--- a/drivers/staging/rt2870/rt_linux.h
+++ b/drivers/staging/rt2870/rt_linux.h
@@ -96,9 +96,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
96#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" 96#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin"
97#define STA_NIC_DEVICE_NAME "RT2870STA" 97#define STA_NIC_DEVICE_NAME "RT2870STA"
98#define STA_DRIVER_VERSION "1.4.0.0" 98#define STA_DRIVER_VERSION "1.4.0.0"
99#ifdef MULTIPLE_CARD_SUPPORT
100#define CARD_INFO_PATH "/etc/Wireless/RT2870STA/RT2870STACard.dat"
101#endif // MULTIPLE_CARD_SUPPORT //
102#endif // RT2870 // 99#endif // RT2870 //
103 100
104#endif // CONFIG_STA_SUPPORT // 101#endif // CONFIG_STA_SUPPORT //
diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 6af95215914..6192ebfcdd1 100644
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -40,13 +40,6 @@
40 40
41#define FORTY_MHZ_INTOLERANT_INTERVAL (60*1000) // 1 min 41#define FORTY_MHZ_INTOLERANT_INTERVAL (60*1000) // 1 min
42 42
43#ifdef MULTIPLE_CARD_SUPPORT
44// record whether the card in the card list is used in the card file
45UINT8 MC_CardUsed[MAX_NUM_OF_MULTIPLE_CARD];
46// record used card mac address in the card list
47static UINT8 MC_CardMac[MAX_NUM_OF_MULTIPLE_CARD][6];
48#endif // MULTIPLE_CARD_SUPPORT //
49
50/*---------------------------------------------------------------------*/ 43/*---------------------------------------------------------------------*/
51/* Private Variables Used */ 44/* Private Variables Used */
52/*---------------------------------------------------------------------*/ 45/*---------------------------------------------------------------------*/
@@ -860,11 +853,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
860 // find available device name 853 // find available device name
861 for (i = 0; i < 8; i++) 854 for (i = 0; i < 8; i++)
862 { 855 {
863#ifdef MULTIPLE_CARD_SUPPORT
864 if (pAd->MC_RowID >= 0)
865 sprintf(slot_name, "ra%02d_%d", pAd->MC_RowID, i);
866 else
867#endif // MULTIPLE_CARD_SUPPORT //
868 sprintf(slot_name, "ra%d", i); 856 sprintf(slot_name, "ra%d", i);
869 857
870 device = dev_get_by_name(dev_net(dev), slot_name); 858 device = dev_get_by_name(dev_net(dev), slot_name);
@@ -882,11 +870,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
882 } 870 }
883 else 871 else
884 { 872 {
885#ifdef MULTIPLE_CARD_SUPPORT
886 if (pAd->MC_RowID >= 0)
887 sprintf(dev->name, "ra%02d_%d", pAd->MC_RowID, i);
888 else
889#endif // MULTIPLE_CARD_SUPPORT //
890 sprintf(dev->name, "ra%d", i); 873 sprintf(dev->name, "ra%d", i);
891 Status = NDIS_STATUS_SUCCESS; 874 Status = NDIS_STATUS_SUCCESS;
892 } 875 }
@@ -895,373 +878,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
895 878
896} 879}
897 880
898
899#ifdef MULTIPLE_CARD_SUPPORT
900/*
901========================================================================
902Routine Description:
903 Get card profile path.
904
905Arguments:
906 pAd
907
908Return Value:
909 TRUE - Find a card profile
910 FALSE - use default profile
911
912Note:
913========================================================================
914*/
915extern INT RTMPGetKeyParameter(
916 IN PCHAR key,
917 OUT PCHAR dest,
918 IN INT destsize,
919 IN PCHAR buffer);
920
921BOOLEAN RTMP_CardInfoRead(
922 IN PRTMP_ADAPTER pAd)
923{
924#define MC_SELECT_CARDID 0 /* use CARD ID (0 ~ 31) to identify different cards */
925#define MC_SELECT_MAC 1 /* use CARD MAC to identify different cards */
926#define MC_SELECT_CARDTYPE 2 /* use CARD type (abgn or bgn) to identify different cards */
927
928#define LETTER_CASE_TRANSLATE(txt_p, card_id) \
929 { UINT32 _len; char _char; \
930 for(_len=0; _len<strlen(card_id); _len++) { \
931 _char = *(txt_p + _len); \
932 if (('A' <= _char) && (_char <= 'Z')) \
933 *(txt_p+_len) = 'a'+(_char-'A'); \
934 } }
935
936 struct file *srcf;
937 INT retval, orgfsuid, orgfsgid;
938 mm_segment_t orgfs;
939 CHAR *buffer, *tmpbuf, card_id_buf[30], RFIC_word[30];
940 BOOLEAN flg_match_ok = FALSE;
941 INT32 card_select_method;
942 INT32 card_free_id, card_nouse_id, card_same_mac_id, card_match_id;
943 EEPROM_ANTENNA_STRUC antenna;
944 USHORT addr01, addr23, addr45;
945 UINT8 mac[6];
946 UINT32 data, card_index;
947 UCHAR *start_ptr;
948
949
950 // init
951 buffer = kmalloc(MAX_INI_BUFFER_SIZE, MEM_ALLOC_FLAG);
952 if (buffer == NULL)
953 return FALSE;
954
955 tmpbuf = kmalloc(MAX_PARAM_BUFFER_SIZE, MEM_ALLOC_FLAG);
956 if(tmpbuf == NULL)
957 {
958 kfree(buffer);
959 return NDIS_STATUS_FAILURE;
960 }
961
962 orgfsuid = current->fsuid;
963 orgfsgid = current->fsgid;
964 current->fsuid = current->fsgid = 0;
965 orgfs = get_fs();
966 set_fs(KERNEL_DS);
967
968 // get RF IC type
969 RTMP_IO_READ32(pAd, E2PROM_CSR, &data);
970
971 if ((data & 0x30) == 0)
972 pAd->EEPROMAddressNum = 6; // 93C46
973 else if ((data & 0x30) == 0x10)
974 pAd->EEPROMAddressNum = 8; // 93C66
975 else
976 pAd->EEPROMAddressNum = 8; // 93C86
977
978 //antenna.word = RTMP_EEPROM_READ16(pAd, EEPROM_NIC1_OFFSET);
979 RT28xx_EEPROM_READ16(pAd, EEPROM_NIC1_OFFSET, antenna.word);
980
981 if ((antenna.field.RfIcType == RFIC_2850) ||
982 (antenna.field.RfIcType == RFIC_2750))
983 {
984 /* ABGN card */
985 strcpy(RFIC_word, "abgn");
986 }
987 else
988 {
989 /* BGN card */
990 strcpy(RFIC_word, "bgn");
991 }
992
993 // get MAC address
994 //addr01 = RTMP_EEPROM_READ16(pAd, 0x04);
995 //addr23 = RTMP_EEPROM_READ16(pAd, 0x06);
996 //addr45 = RTMP_EEPROM_READ16(pAd, 0x08);
997 RT28xx_EEPROM_READ16(pAd, 0x04, addr01);
998 RT28xx_EEPROM_READ16(pAd, 0x06, addr23);
999 RT28xx_EEPROM_READ16(pAd, 0x08, addr45);
1000
1001 mac[0] = (UCHAR)(addr01 & 0xff);
1002 mac[1] = (UCHAR)(addr01 >> 8);
1003 mac[2] = (UCHAR)(addr23 & 0xff);
1004 mac[3] = (UCHAR)(addr23 >> 8);
1005 mac[4] = (UCHAR)(addr45 & 0xff);
1006 mac[5] = (UCHAR)(addr45 >> 8);
1007
1008 // open card information file
1009 srcf = filp_open(CARD_INFO_PATH, O_RDONLY, 0);
1010 if (IS_ERR(srcf))
1011 {
1012 /* card information file does not exist */
1013 DBGPRINT(RT_DEBUG_TRACE,
1014 ("--> Error %ld opening %s\n", -PTR_ERR(srcf), CARD_INFO_PATH));
1015 return FALSE;
1016 }
1017
1018 if (srcf->f_op && srcf->f_op->read)
1019 {
1020 /* card information file exists so reading the card information */
1021 memset(buffer, 0x00, MAX_INI_BUFFER_SIZE);
1022 retval = srcf->f_op->read(srcf, buffer, MAX_INI_BUFFER_SIZE, &srcf->f_pos);
1023 if (retval < 0)
1024 {
1025 /* read fail */
1026 DBGPRINT(RT_DEBUG_TRACE,
1027 ("--> Read %s error %d\n", CARD_INFO_PATH, -retval));
1028 }
1029 else
1030 {
1031 /* get card selection method */
1032 memset(tmpbuf, 0x00, MAX_PARAM_BUFFER_SIZE);
1033 card_select_method = MC_SELECT_CARDTYPE; // default
1034
1035 if (RTMPGetKeyParameter("SELECT", tmpbuf, 256, buffer))
1036 {
1037 if (strcmp(tmpbuf, "CARDID") == 0)
1038 card_select_method = MC_SELECT_CARDID;
1039 else if (strcmp(tmpbuf, "MAC") == 0)
1040 card_select_method = MC_SELECT_MAC;
1041 else if (strcmp(tmpbuf, "CARDTYPE") == 0)
1042 card_select_method = MC_SELECT_CARDTYPE;
1043 }
1044
1045 DBGPRINT(RT_DEBUG_TRACE,
1046 ("MC> Card Selection = %d\n", card_select_method));
1047
1048 // init
1049 card_free_id = -1;
1050 card_nouse_id = -1;
1051 card_same_mac_id = -1;
1052 card_match_id = -1;
1053
1054 // search current card information records
1055 for(card_index=0;
1056 card_index<MAX_NUM_OF_MULTIPLE_CARD;
1057 card_index++)
1058 {
1059 if ((*(UINT32 *)&MC_CardMac[card_index][0] == 0) &&
1060 (*(UINT16 *)&MC_CardMac[card_index][4] == 0))
1061 {
1062 // MAC is all-0 so the entry is available
1063 MC_CardUsed[card_index] = 0;
1064
1065 if (card_free_id < 0)
1066 card_free_id = card_index; // 1st free entry
1067 }
1068 else
1069 {
1070 if (memcmp(MC_CardMac[card_index], mac, 6) == 0)
1071 {
1072 // we find the entry with same MAC
1073 if (card_same_mac_id < 0)
1074 card_same_mac_id = card_index; // 1st same entry
1075 }
1076 else
1077 {
1078 // MAC is not all-0 but used flag == 0
1079 if ((MC_CardUsed[card_index] == 0) &&
1080 (card_nouse_id < 0))
1081 {
1082 card_nouse_id = card_index; // 1st available entry
1083 }
1084 }
1085 }
1086 }
1087
1088 DBGPRINT(RT_DEBUG_TRACE,
1089 ("MC> Free = %d, Same = %d, NOUSE = %d\n",
1090 card_free_id, card_same_mac_id, card_nouse_id));
1091
1092 if ((card_same_mac_id >= 0) &&
1093 ((card_select_method == MC_SELECT_CARDID) ||
1094 (card_select_method == MC_SELECT_CARDTYPE)))
1095 {
1096 // same MAC entry is found
1097 card_match_id = card_same_mac_id;
1098
1099 if (card_select_method == MC_SELECT_CARDTYPE)
1100 {
1101 // for CARDTYPE
1102 sprintf(card_id_buf, "%02dCARDTYPE%s",
1103 card_match_id, RFIC_word);
1104
1105 if ((start_ptr=rtstrstruncasecmp(buffer, card_id_buf)) != NULL)
1106 {
1107 // we found the card ID
1108 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
1109 }
1110 }
1111 }
1112 else
1113 {
1114 // the card is 1st plug-in, try to find the match card profile
1115 switch(card_select_method)
1116 {
1117 case MC_SELECT_CARDID: // CARDID
1118 default:
1119 if (card_free_id >= 0)
1120 card_match_id = card_free_id;
1121 else
1122 card_match_id = card_nouse_id;
1123 break;
1124
1125 case MC_SELECT_MAC: // MAC
1126 sprintf(card_id_buf, "MAC%02x:%02x:%02x:%02x:%02x:%02x",
1127 mac[0], mac[1], mac[2],
1128 mac[3], mac[4], mac[5]);
1129
1130 /* try to find the key word in the card file */
1131 if ((start_ptr=rtstrstruncasecmp(buffer, card_id_buf)) != NULL)
1132 {
1133 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
1134
1135 /* get the row ID (2 ASCII characters) */
1136 start_ptr -= 2;
1137 card_id_buf[0] = *(start_ptr);
1138 card_id_buf[1] = *(start_ptr+1);
1139 card_id_buf[2] = 0x00;
1140
1141 card_match_id = simple_strtol(card_id_buf, 0, 10);
1142 }
1143 break;
1144
1145 case MC_SELECT_CARDTYPE: // CARDTYPE
1146 card_nouse_id = -1;
1147
1148 for(card_index=0;
1149 card_index<MAX_NUM_OF_MULTIPLE_CARD;
1150 card_index++)
1151 {
1152 sprintf(card_id_buf, "%02dCARDTYPE%s",
1153 card_index, RFIC_word);
1154
1155 if ((start_ptr=rtstrstruncasecmp(buffer,
1156 card_id_buf)) != NULL)
1157 {
1158 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
1159
1160 if (MC_CardUsed[card_index] == 0)
1161 {
1162 /* current the card profile is not used */
1163 if ((*(UINT32 *)&MC_CardMac[card_index][0] == 0) &&
1164 (*(UINT16 *)&MC_CardMac[card_index][4] == 0))
1165 {
1166 // find it and no previous card use it
1167 card_match_id = card_index;
1168 break;
1169 }
1170 else
1171 {
1172 // ever a card use it
1173 if (card_nouse_id < 0)
1174 card_nouse_id = card_index;
1175 }
1176 }
1177 }
1178 }
1179
1180 // if not find a free one, use the available one
1181 if (card_match_id < 0)
1182 card_match_id = card_nouse_id;
1183 break;
1184 }
1185 }
1186
1187 if (card_match_id >= 0)
1188 {
1189 // make up search keyword
1190 switch(card_select_method)
1191 {
1192 case MC_SELECT_CARDID: // CARDID
1193 sprintf(card_id_buf, "%02dCARDID", card_match_id);
1194 break;
1195
1196 case MC_SELECT_MAC: // MAC
1197 sprintf(card_id_buf,
1198 "%02dmac%02x:%02x:%02x:%02x:%02x:%02x",
1199 card_match_id,
1200 mac[0], mac[1], mac[2],
1201 mac[3], mac[4], mac[5]);
1202 break;
1203
1204 case MC_SELECT_CARDTYPE: // CARDTYPE
1205 default:
1206 sprintf(card_id_buf, "%02dcardtype%s",
1207 card_match_id, RFIC_word);
1208 break;
1209 }
1210
1211 DBGPRINT(RT_DEBUG_TRACE, ("Search Keyword = %s\n", card_id_buf));
1212
1213 // read card file path
1214 if (RTMPGetKeyParameter(card_id_buf, tmpbuf, 256, buffer))
1215 {
1216 if (strlen(tmpbuf) < sizeof(pAd->MC_FileName))
1217 {
1218 // backup card information
1219 pAd->MC_RowID = card_match_id; /* base 0 */
1220 MC_CardUsed[card_match_id] = 1;
1221 memcpy(MC_CardMac[card_match_id], mac, sizeof(mac));
1222
1223 // backup card file path
1224 NdisMoveMemory(pAd->MC_FileName, tmpbuf , strlen(tmpbuf));
1225 pAd->MC_FileName[strlen(tmpbuf)] = '\0';
1226 flg_match_ok = TRUE;
1227
1228 DBGPRINT(RT_DEBUG_TRACE,
1229 ("Card Profile Name = %s\n", pAd->MC_FileName));
1230 }
1231 else
1232 {
1233 DBGPRINT(RT_DEBUG_ERROR,
1234 ("Card Profile Name length too large!\n"));
1235 }
1236 }
1237 else
1238 {
1239 DBGPRINT(RT_DEBUG_ERROR,
1240 ("Can not find search key word in card.dat!\n"));
1241 }
1242
1243 if ((flg_match_ok != TRUE) &&
1244 (card_match_id < MAX_NUM_OF_MULTIPLE_CARD))
1245 {
1246 MC_CardUsed[card_match_id] = 0;
1247 memset(MC_CardMac[card_match_id], 0, sizeof(mac));
1248 }
1249 } // if (card_match_id >= 0)
1250 }
1251 }
1252
1253 // close file
1254 retval = filp_close(srcf, NULL);
1255 set_fs(orgfs);
1256 current->fsuid = orgfsuid;
1257 current->fsgid = orgfsgid;
1258 kfree(buffer);
1259 kfree(tmpbuf);
1260 return flg_match_ok;
1261}
1262#endif // MULTIPLE_CARD_SUPPORT //
1263
1264
1265/* 881/*
1266======================================================================== 882========================================================================
1267Routine Description: 883Routine Description:
@@ -1353,21 +969,6 @@ INT __devinit rt28xx_probe(
1353 pAd->OpMode = OPMODE_STA; 969 pAd->OpMode = OPMODE_STA;
1354#endif // CONFIG_STA_SUPPORT // 970#endif // CONFIG_STA_SUPPORT //
1355 971
1356
1357#ifdef MULTIPLE_CARD_SUPPORT
1358 // find its profile path
1359 pAd->MC_RowID = -1; // use default profile path
1360 RTMP_CardInfoRead(pAd);
1361
1362 if (pAd->MC_RowID == -1)
1363#ifdef CONFIG_STA_SUPPORT
1364 strcpy(pAd->MC_FileName, STA_PROFILE_PATH);
1365#endif // CONFIG_STA_SUPPORT //
1366
1367 DBGPRINT(RT_DEBUG_TRACE,
1368 ("MC> ROW = %d, PATH = %s\n", pAd->MC_RowID, pAd->MC_FileName));
1369#endif // MULTIPLE_CARD_SUPPORT //
1370
1371 // sample move 972 // sample move
1372 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS) 973 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS)
1373 goto err_out_unmap; 974 goto err_out_unmap;
diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index 14d2ee2991b..9e0746e941a 100644
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -919,9 +919,6 @@ NDIS_STATUS RTMPReadParametersHook(
919 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 919 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
920 src = STA_PROFILE_PATH; 920 src = STA_PROFILE_PATH;
921#endif // CONFIG_STA_SUPPORT // 921#endif // CONFIG_STA_SUPPORT //
922#ifdef MULTIPLE_CARD_SUPPORT
923 src = pAd->MC_FileName;
924#endif // MULTIPLE_CARD_SUPPORT //
925 922
926 // Save uid and gid used for filesystem access. 923 // Save uid and gid used for filesystem access.
927 // Set user and group to 0 (root) 924 // Set user and group to 0 (root)
diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index 5bc83d0453d..65d766c7307 100644
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -2911,11 +2911,6 @@ typedef struct _RTMP_ADAPTER
2911 2911
2912 struct net_device_stats stats; 2912 struct net_device_stats stats;
2913 2913
2914#ifdef MULTIPLE_CARD_SUPPORT
2915 INT32 MC_RowID;
2916 UCHAR MC_FileName[256];
2917#endif // MULTIPLE_CARD_SUPPORT //
2918
2919 ULONG TbttTickCount; 2914 ULONG TbttTickCount;
2920#ifdef PCI_MSI_SUPPORT 2915#ifdef PCI_MSI_SUPPORT
2921 BOOLEAN HaveMsi; 2916 BOOLEAN HaveMsi;
diff --git a/drivers/staging/rt2870/rtmp_def.h b/drivers/staging/rt2870/rtmp_def.h
index 35cbc61482a..70f8f2fd6a4 100644
--- a/drivers/staging/rt2870/rtmp_def.h
+++ b/drivers/staging/rt2870/rtmp_def.h
@@ -123,11 +123,6 @@
123#define LOCAL_TXBUF_SIZE 2048 123#define LOCAL_TXBUF_SIZE 2048
124#endif // RT2870 // 124#endif // RT2870 //
125 125
126#ifdef MULTIPLE_CARD_SUPPORT
127// MC: Multple Cards
128#define MAX_NUM_OF_MULTIPLE_CARD 32
129#endif // MULTIPLE_CARD_SUPPORT //
130
131#define MAX_RX_PROCESS 128 //64 //32 126#define MAX_RX_PROCESS 128 //64 //32
132#define NUM_OF_LOCAL_TXBUF 2 127#define NUM_OF_LOCAL_TXBUF 2
133#define TXD_SIZE 16 128#define TXD_SIZE 16
diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 1a074dd8981..30217531d65 100644
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -5090,9 +5090,6 @@ INT RTMPQueryInformation(
5090 case RT_OID_QUERY_MULTIPLE_CARD_SUPPORT: 5090 case RT_OID_QUERY_MULTIPLE_CARD_SUPPORT:
5091 wrq->u.data.length = sizeof(UCHAR); 5091 wrq->u.data.length = sizeof(UCHAR);
5092 i = 0; 5092 i = 0;
5093#ifdef MULTIPLE_CARD_SUPPORT
5094 i = 1;
5095#endif // MULTIPLE_CARD_SUPPORT //
5096 if (copy_to_user(wrq->u.data.pointer, &i, wrq->u.data.length)) 5093 if (copy_to_user(wrq->u.data.pointer, &i, wrq->u.data.length))
5097 { 5094 {
5098 Status = -EFAULT; 5095 Status = -EFAULT;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 19:47:02 -0400