aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 10:05:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:43 -0400
commit72888d31af50c4e8c2732ffd557655444bf9c8a2 (patch)
treed4147be6da4a10277ec6d4aa86a48d8084ef1abc
parent3fce9b667919e59a4d3d6c560a713a5f2ecaf5aa (diff)
Staging: rt2860: 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/rt2860/2860_main_dev.c15
-rw-r--r--drivers/staging/rt2860/rt_linux.h5
-rw-r--r--drivers/staging/rt2860/rt_main_dev.c395
-rw-r--r--drivers/staging/rt2860/rt_profile.c3
-rw-r--r--drivers/staging/rt2860/rtmp.h5
-rw-r--r--drivers/staging/rt2860/rtmp_def.h6
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c3
7 files changed, 0 insertions, 432 deletions
diff --git a/drivers/staging/rt2860/2860_main_dev.c b/drivers/staging/rt2860/2860_main_dev.c
index ff7f8338073..4f39fcbbf2e 100644
--- a/drivers/staging/rt2860/2860_main_dev.c
+++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -37,13 +37,6 @@
37 37
38#include "rt_config.h" 38#include "rt_config.h"
39 39
40
41#ifdef MULTIPLE_CARD_SUPPORT
42// record whether the card in the card list is used in the card file
43extern UINT8 MC_CardUsed[];
44#endif // MULTIPLE_CARD_SUPPORT //
45
46
47extern INT __devinit rt28xx_probe(IN void *_dev_p, IN void *_dev_id_p, 40extern INT __devinit rt28xx_probe(IN void *_dev_p, IN void *_dev_id_p,
48 IN UINT argc, OUT PRTMP_ADAPTER *ppAd); 41 IN UINT argc, OUT PRTMP_ADAPTER *ppAd);
49 42
@@ -328,14 +321,6 @@ static VOID __devexit rt2860_remove_one(
328 321
329 if (pAd != NULL) 322 if (pAd != NULL)
330 { 323 {
331#ifdef MULTIPLE_CARD_SUPPORT
332 if ((pAd->MC_RowID >= 0) && (pAd->MC_RowID <= MAX_NUM_OF_MULTIPLE_CARD))
333 MC_CardUsed[pAd->MC_RowID] = 0; // not clear MAC address
334#endif // MULTIPLE_CARD_SUPPORT //
335
336
337
338
339 // Unregister network device 324 // Unregister network device
340 unregister_netdev(net_dev); 325 unregister_netdev(net_dev);
341 326
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index 47564797473..9d2153ebdfb 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -92,11 +92,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
92#define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin" 92#define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin"
93#define STA_NIC_DEVICE_NAME "RT2860STA" 93#define STA_NIC_DEVICE_NAME "RT2860STA"
94#define STA_DRIVER_VERSION "1.8.1.1" 94#define STA_DRIVER_VERSION "1.8.1.1"
95#ifdef MULTIPLE_CARD_SUPPORT
96#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat"
97#endif // MULTIPLE_CARD_SUPPORT //
98
99
100#endif // CONFIG_STA_SUPPORT // 95#endif // CONFIG_STA_SUPPORT //
101 96
102#ifndef PCI_DEVICE 97#ifndef PCI_DEVICE
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index e3b7c4e6025..95965a2a779 100644
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/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/*---------------------------------------------------------------------*/
@@ -726,11 +719,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
726 // find available device name 719 // find available device name
727 for (i = 0; i < 8; i++) 720 for (i = 0; i < 8; i++)
728 { 721 {
729#ifdef MULTIPLE_CARD_SUPPORT
730 if (pAd->MC_RowID >= 0)
731 sprintf(slot_name, "ra%02d_%d", pAd->MC_RowID, i);
732 else
733#endif // MULTIPLE_CARD_SUPPORT //
734 sprintf(slot_name, "ra%d", i); 722 sprintf(slot_name, "ra%d", i);
735 723
736 device = dev_get_by_name(dev_net(dev), slot_name); 724 device = dev_get_by_name(dev_net(dev), slot_name);
@@ -748,11 +736,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
748 } 736 }
749 else 737 else
750 { 738 {
751#ifdef MULTIPLE_CARD_SUPPORT
752 if (pAd->MC_RowID >= 0)
753 sprintf(dev->name, "ra%02d_%d", pAd->MC_RowID, i);
754 else
755#endif // MULTIPLE_CARD_SUPPORT //
756 sprintf(dev->name, "ra%d", i); 739 sprintf(dev->name, "ra%d", i);
757 Status = NDIS_STATUS_SUCCESS; 740 Status = NDIS_STATUS_SUCCESS;
758 } 741 }
@@ -761,369 +744,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
761 744
762} 745}
763 746
764
765#ifdef MULTIPLE_CARD_SUPPORT
766/*
767========================================================================
768Routine Description:
769 Get card profile path.
770
771Arguments:
772 pAd
773
774Return Value:
775 TRUE - Find a card profile
776 FALSE - use default profile
777
778Note:
779========================================================================
780*/
781extern INT RTMPGetKeyParameter(
782 IN PCHAR key,
783 OUT PCHAR dest,
784 IN INT destsize,
785 IN PCHAR buffer);
786
787BOOLEAN RTMP_CardInfoRead(
788 IN PRTMP_ADAPTER pAd)
789{
790#define MC_SELECT_CARDID 0 /* use CARD ID (0 ~ 31) to identify different cards */
791#define MC_SELECT_MAC 1 /* use CARD MAC to identify different cards */
792#define MC_SELECT_CARDTYPE 2 /* use CARD type (abgn or bgn) to identify different cards */
793
794#define LETTER_CASE_TRANSLATE(txt_p, card_id) \
795 { UINT32 _len; char _char; \
796 for(_len=0; _len<strlen(card_id); _len++) { \
797 _char = *(txt_p + _len); \
798 if (('A' <= _char) && (_char <= 'Z')) \
799 *(txt_p+_len) = 'a'+(_char-'A'); \
800 } }
801
802 struct file *srcf;
803 INT retval, orgfsuid, orgfsgid;
804 mm_segment_t orgfs;
805 CHAR *buffer, *tmpbuf, card_id_buf[30], RFIC_word[30];
806 BOOLEAN flg_match_ok = FALSE;
807 INT32 card_select_method;
808 INT32 card_free_id, card_nouse_id, card_same_mac_id, card_match_id;
809 EEPROM_ANTENNA_STRUC antenna;
810 USHORT addr01, addr23, addr45;
811 UINT8 mac[6];
812 UINT32 data, card_index;
813 UCHAR *start_ptr;
814
815
816 // init
817 buffer = kmalloc(MAX_INI_BUFFER_SIZE, MEM_ALLOC_FLAG);
818 if (buffer == NULL)
819 return FALSE;
820
821 tmpbuf = kmalloc(MAX_PARAM_BUFFER_SIZE, MEM_ALLOC_FLAG);
822 if(tmpbuf == NULL)
823 {
824 kfree(buffer);
825 return NDIS_STATUS_FAILURE;
826 }
827
828 orgfsuid = current->fsuid;
829 orgfsgid = current->fsgid;
830 current->fsuid = current->fsgid = 0;
831 orgfs = get_fs();
832 set_fs(KERNEL_DS);
833
834 // get RF IC type
835 RTMP_IO_READ32(pAd, E2PROM_CSR, &data);
836
837 if ((data & 0x30) == 0)
838 pAd->EEPROMAddressNum = 6; // 93C46
839 else if ((data & 0x30) == 0x10)
840 pAd->EEPROMAddressNum = 8; // 93C66
841 else
842 pAd->EEPROMAddressNum = 8; // 93C86
843
844 RT28xx_EEPROM_READ16(pAd, EEPROM_NIC1_OFFSET, antenna.word);
845
846 if ((antenna.field.RfIcType == RFIC_2850) ||
847 (antenna.field.RfIcType == RFIC_2750))
848 {
849 /* ABGN card */
850 strcpy(RFIC_word, "abgn");
851 }
852 else
853 {
854 /* BGN card */
855 strcpy(RFIC_word, "bgn");
856 }
857
858 // get MAC address
859 RT28xx_EEPROM_READ16(pAd, 0x04, addr01);
860 RT28xx_EEPROM_READ16(pAd, 0x06, addr23);
861 RT28xx_EEPROM_READ16(pAd, 0x08, addr45);
862
863 mac[0] = (UCHAR)(addr01 & 0xff);
864 mac[1] = (UCHAR)(addr01 >> 8);
865 mac[2] = (UCHAR)(addr23 & 0xff);
866 mac[3] = (UCHAR)(addr23 >> 8);
867 mac[4] = (UCHAR)(addr45 & 0xff);
868 mac[5] = (UCHAR)(addr45 >> 8);
869
870 // open card information file
871 srcf = filp_open(CARD_INFO_PATH, O_RDONLY, 0);
872 if (IS_ERR(srcf))
873 {
874 /* card information file does not exist */
875 DBGPRINT(RT_DEBUG_TRACE,
876 ("--> Error %ld opening %s\n", -PTR_ERR(srcf), CARD_INFO_PATH));
877 return FALSE;
878 }
879
880 if (srcf->f_op && srcf->f_op->read)
881 {
882 /* card information file exists so reading the card information */
883 memset(buffer, 0x00, MAX_INI_BUFFER_SIZE);
884 retval = srcf->f_op->read(srcf, buffer, MAX_INI_BUFFER_SIZE, &srcf->f_pos);
885 if (retval < 0)
886 {
887 /* read fail */
888 DBGPRINT(RT_DEBUG_TRACE,
889 ("--> Read %s error %d\n", CARD_INFO_PATH, -retval));
890 }
891 else
892 {
893 /* get card selection method */
894 memset(tmpbuf, 0x00, MAX_PARAM_BUFFER_SIZE);
895 card_select_method = MC_SELECT_CARDTYPE; // default
896
897 if (RTMPGetKeyParameter("SELECT", tmpbuf, 256, buffer))
898 {
899 if (strcmp(tmpbuf, "CARDID") == 0)
900 card_select_method = MC_SELECT_CARDID;
901 else if (strcmp(tmpbuf, "MAC") == 0)
902 card_select_method = MC_SELECT_MAC;
903 else if (strcmp(tmpbuf, "CARDTYPE") == 0)
904 card_select_method = MC_SELECT_CARDTYPE;
905 }
906
907 DBGPRINT(RT_DEBUG_TRACE,
908 ("MC> Card Selection = %d\n", card_select_method));
909
910 // init
911 card_free_id = -1;
912 card_nouse_id = -1;
913 card_same_mac_id = -1;
914 card_match_id = -1;
915
916 // search current card information records
917 for(card_index=0;
918 card_index<MAX_NUM_OF_MULTIPLE_CARD;
919 card_index++)
920 {
921 if ((*(UINT32 *)&MC_CardMac[card_index][0] == 0) &&
922 (*(UINT16 *)&MC_CardMac[card_index][4] == 0))
923 {
924 // MAC is all-0 so the entry is available
925 MC_CardUsed[card_index] = 0;
926
927 if (card_free_id < 0)
928 card_free_id = card_index; // 1st free entry
929 }
930 else
931 {
932 if (memcmp(MC_CardMac[card_index], mac, 6) == 0)
933 {
934 // we find the entry with same MAC
935 if (card_same_mac_id < 0)
936 card_same_mac_id = card_index; // 1st same entry
937 }
938 else
939 {
940 // MAC is not all-0 but used flag == 0
941 if ((MC_CardUsed[card_index] == 0) &&
942 (card_nouse_id < 0))
943 {
944 card_nouse_id = card_index; // 1st available entry
945 }
946 }
947 }
948 }
949
950 DBGPRINT(RT_DEBUG_TRACE,
951 ("MC> Free = %d, Same = %d, NOUSE = %d\n",
952 card_free_id, card_same_mac_id, card_nouse_id));
953
954 if ((card_same_mac_id >= 0) &&
955 ((card_select_method == MC_SELECT_CARDID) ||
956 (card_select_method == MC_SELECT_CARDTYPE)))
957 {
958 // same MAC entry is found
959 card_match_id = card_same_mac_id;
960
961 if (card_select_method == MC_SELECT_CARDTYPE)
962 {
963 // for CARDTYPE
964 sprintf(card_id_buf, "%02dCARDTYPE%s",
965 card_match_id, RFIC_word);
966
967 if ((start_ptr=rtstrstruncasecmp(buffer, card_id_buf)) != NULL)
968 {
969 // we found the card ID
970 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
971 }
972 }
973 }
974 else
975 {
976 // the card is 1st plug-in, try to find the match card profile
977 switch(card_select_method)
978 {
979 case MC_SELECT_CARDID: // CARDID
980 default:
981 if (card_free_id >= 0)
982 card_match_id = card_free_id;
983 else
984 card_match_id = card_nouse_id;
985 break;
986
987 case MC_SELECT_MAC: // MAC
988 sprintf(card_id_buf, "MAC%02x:%02x:%02x:%02x:%02x:%02x",
989 mac[0], mac[1], mac[2],
990 mac[3], mac[4], mac[5]);
991
992 /* try to find the key word in the card file */
993 if ((start_ptr=rtstrstruncasecmp(buffer, card_id_buf)) != NULL)
994 {
995 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
996
997 /* get the row ID (2 ASCII characters) */
998 start_ptr -= 2;
999 card_id_buf[0] = *(start_ptr);
1000 card_id_buf[1] = *(start_ptr+1);
1001 card_id_buf[2] = 0x00;
1002
1003 card_match_id = simple_strtol(card_id_buf, 0, 10);
1004 }
1005 break;
1006
1007 case MC_SELECT_CARDTYPE: // CARDTYPE
1008 card_nouse_id = -1;
1009
1010 for(card_index=0;
1011 card_index<MAX_NUM_OF_MULTIPLE_CARD;
1012 card_index++)
1013 {
1014 sprintf(card_id_buf, "%02dCARDTYPE%s",
1015 card_index, RFIC_word);
1016
1017 if ((start_ptr=rtstrstruncasecmp(buffer,
1018 card_id_buf)) != NULL)
1019 {
1020 LETTER_CASE_TRANSLATE(start_ptr, card_id_buf);
1021
1022 if (MC_CardUsed[card_index] == 0)
1023 {
1024 /* current the card profile is not used */
1025 if ((*(UINT32 *)&MC_CardMac[card_index][0] == 0) &&
1026 (*(UINT16 *)&MC_CardMac[card_index][4] == 0))
1027 {
1028 // find it and no previous card use it
1029 card_match_id = card_index;
1030 break;
1031 }
1032 else
1033 {
1034 // ever a card use it
1035 if (card_nouse_id < 0)
1036 card_nouse_id = card_index;
1037 }
1038 }
1039 }
1040 }
1041
1042 // if not find a free one, use the available one
1043 if (card_match_id < 0)
1044 card_match_id = card_nouse_id;
1045 break;
1046 }
1047 }
1048
1049 if (card_match_id >= 0)
1050 {
1051 // make up search keyword
1052 switch(card_select_method)
1053 {
1054 case MC_SELECT_CARDID: // CARDID
1055 sprintf(card_id_buf, "%02dCARDID", card_match_id);
1056 break;
1057
1058 case MC_SELECT_MAC: // MAC
1059 sprintf(card_id_buf,
1060 "%02dmac%02x:%02x:%02x:%02x:%02x:%02x",
1061 card_match_id,
1062 mac[0], mac[1], mac[2],
1063 mac[3], mac[4], mac[5]);
1064 break;
1065
1066 case MC_SELECT_CARDTYPE: // CARDTYPE
1067 default:
1068 sprintf(card_id_buf, "%02dcardtype%s",
1069 card_match_id, RFIC_word);
1070 break;
1071 }
1072
1073 DBGPRINT(RT_DEBUG_TRACE, ("Search Keyword = %s\n", card_id_buf));
1074
1075 // read card file path
1076 if (RTMPGetKeyParameter(card_id_buf, tmpbuf, 256, buffer))
1077 {
1078 if (strlen(tmpbuf) < sizeof(pAd->MC_FileName))
1079 {
1080 // backup card information
1081 pAd->MC_RowID = card_match_id; /* base 0 */
1082 MC_CardUsed[card_match_id] = 1;
1083 memcpy(MC_CardMac[card_match_id], mac, sizeof(mac));
1084
1085 // backup card file path
1086 NdisMoveMemory(pAd->MC_FileName, tmpbuf , strlen(tmpbuf));
1087 pAd->MC_FileName[strlen(tmpbuf)] = '\0';
1088 flg_match_ok = TRUE;
1089
1090 DBGPRINT(RT_DEBUG_TRACE,
1091 ("Card Profile Name = %s\n", pAd->MC_FileName));
1092 }
1093 else
1094 {
1095 DBGPRINT(RT_DEBUG_ERROR,
1096 ("Card Profile Name length too large!\n"));
1097 }
1098 }
1099 else
1100 {
1101 DBGPRINT(RT_DEBUG_ERROR,
1102 ("Can not find search key word in card.dat!\n"));
1103 }
1104
1105 if ((flg_match_ok != TRUE) &&
1106 (card_match_id < MAX_NUM_OF_MULTIPLE_CARD))
1107 {
1108 MC_CardUsed[card_match_id] = 0;
1109 memset(MC_CardMac[card_match_id], 0, sizeof(mac));
1110 }
1111 } // if (card_match_id >= 0)
1112 }
1113 }
1114
1115 // close file
1116 retval = filp_close(srcf, NULL);
1117 set_fs(orgfs);
1118 current->fsuid = orgfsuid;
1119 current->fsgid = orgfsgid;
1120 kfree(buffer);
1121 kfree(tmpbuf);
1122 return flg_match_ok;
1123}
1124#endif // MULTIPLE_CARD_SUPPORT //
1125
1126
1127/* 747/*
1128======================================================================== 748========================================================================
1129Routine Description: 749Routine Description:
@@ -1199,21 +819,6 @@ INT __devinit rt28xx_probe(
1199 pAd->OpMode = OPMODE_STA; 819 pAd->OpMode = OPMODE_STA;
1200#endif // CONFIG_STA_SUPPORT // 820#endif // CONFIG_STA_SUPPORT //
1201 821
1202
1203#ifdef MULTIPLE_CARD_SUPPORT
1204 // find its profile path
1205 pAd->MC_RowID = -1; // use default profile path
1206 RTMP_CardInfoRead(pAd);
1207
1208 if (pAd->MC_RowID == -1)
1209#ifdef CONFIG_STA_SUPPORT
1210 strcpy(pAd->MC_FileName, STA_PROFILE_PATH);
1211#endif // CONFIG_STA_SUPPORT //
1212
1213 DBGPRINT(RT_DEBUG_TRACE,
1214 ("MC> ROW = %d, PATH = %s\n", pAd->MC_RowID, pAd->MC_FileName));
1215#endif // MULTIPLE_CARD_SUPPORT //
1216
1217 // sample move 822 // sample move
1218 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS) 823 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS)
1219 goto err_out_unmap; 824 goto err_out_unmap;
diff --git a/drivers/staging/rt2860/rt_profile.c b/drivers/staging/rt2860/rt_profile.c
index cf48923c7d3..27f69a51349 100644
--- a/drivers/staging/rt2860/rt_profile.c
+++ b/drivers/staging/rt2860/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/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index 16a0e2e7f2b..aa06070a5cb 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -2836,11 +2836,6 @@ typedef struct _RTMP_ADAPTER
2836 2836
2837 struct net_device_stats stats; 2837 struct net_device_stats stats;
2838 2838
2839#ifdef MULTIPLE_CARD_SUPPORT
2840 INT32 MC_RowID;
2841 UCHAR MC_FileName[256];
2842#endif // MULTIPLE_CARD_SUPPORT //
2843
2844 ULONG TbttTickCount; 2839 ULONG TbttTickCount;
2845#ifdef PCI_MSI_SUPPORT 2840#ifdef PCI_MSI_SUPPORT
2846 BOOLEAN HaveMsi; 2841 BOOLEAN HaveMsi;
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h
index e9bc055370e..aa975acfc96 100644
--- a/drivers/staging/rt2860/rtmp_def.h
+++ b/drivers/staging/rt2860/rtmp_def.h
@@ -119,12 +119,6 @@
119#define MAX_TX_DONE_PROCESS TX_RING_SIZE //8 119#define MAX_TX_DONE_PROCESS TX_RING_SIZE //8
120#define LOCAL_TXBUF_SIZE 2 120#define LOCAL_TXBUF_SIZE 2
121 121
122
123#ifdef MULTIPLE_CARD_SUPPORT
124// MC: Multple Cards
125#define MAX_NUM_OF_MULTIPLE_CARD 32
126#endif // MULTIPLE_CARD_SUPPORT //
127
128#define MAX_RX_PROCESS 128 //64 //32 122#define MAX_RX_PROCESS 128 //64 //32
129#define NUM_OF_LOCAL_TXBUF 2 123#define NUM_OF_LOCAL_TXBUF 2
130#define TXD_SIZE 16 124#define TXD_SIZE 16
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index d95b3257aff..304e49c59a2 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -5073,9 +5073,6 @@ INT RTMPQueryInformation(
5073 case RT_OID_QUERY_MULTIPLE_CARD_SUPPORT: 5073 case RT_OID_QUERY_MULTIPLE_CARD_SUPPORT:
5074 wrq->u.data.length = sizeof(UCHAR); 5074 wrq->u.data.length = sizeof(UCHAR);
5075 i = 0; 5075 i = 0;
5076#ifdef MULTIPLE_CARD_SUPPORT
5077 i = 1;
5078#endif // MULTIPLE_CARD_SUPPORT //
5079 if (copy_to_user(wrq->u.data.pointer, &i, wrq->u.data.length)) 5076 if (copy_to_user(wrq->u.data.pointer, &i, wrq->u.data.length))
5080 { 5077 {
5081 Status = -EFAULT; 5078 Status = -EFAULT;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 22:07:19 -0400