aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2011-12-27 19:53:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-04 14:31:45 -0500
commitbc93eda7e903ff75cefcb6e247ed9b8e9f8e9783 (patch)
treeb5082b227ae6089d79e02084c9438235ffbeeb62
parent65a692284d0343e1610eaf91a333a29769e989ef (diff)
rt2x00: Identify rt2800usb chipsets.
According to the latest USB ID database these are all RT2770 / RT2870 / RT307x devices. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2800usb.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 486fd4994ae1..5bff4957a862 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -914,12 +914,14 @@ static struct usb_device_id rt2800usb_device_table[] = {
914 { USB_DEVICE(0x050d, 0x8053) }, 914 { USB_DEVICE(0x050d, 0x8053) },
915 { USB_DEVICE(0x050d, 0x805c) }, 915 { USB_DEVICE(0x050d, 0x805c) },
916 { USB_DEVICE(0x050d, 0x815c) }, 916 { USB_DEVICE(0x050d, 0x815c) },
917 { USB_DEVICE(0x050d, 0x825a) },
917 { USB_DEVICE(0x050d, 0x825b) }, 918 { USB_DEVICE(0x050d, 0x825b) },
918 { USB_DEVICE(0x050d, 0x935a) }, 919 { USB_DEVICE(0x050d, 0x935a) },
919 { USB_DEVICE(0x050d, 0x935b) }, 920 { USB_DEVICE(0x050d, 0x935b) },
920 /* Buffalo */ 921 /* Buffalo */
921 { USB_DEVICE(0x0411, 0x00e8) }, 922 { USB_DEVICE(0x0411, 0x00e8) },
922 { USB_DEVICE(0x0411, 0x0158) }, 923 { USB_DEVICE(0x0411, 0x0158) },
924 { USB_DEVICE(0x0411, 0x015d) },
923 { USB_DEVICE(0x0411, 0x016f) }, 925 { USB_DEVICE(0x0411, 0x016f) },
924 { USB_DEVICE(0x0411, 0x01a2) }, 926 { USB_DEVICE(0x0411, 0x01a2) },
925 /* Corega */ 927 /* Corega */
@@ -934,6 +936,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
934 { USB_DEVICE(0x07d1, 0x3c0e) }, 936 { USB_DEVICE(0x07d1, 0x3c0e) },
935 { USB_DEVICE(0x07d1, 0x3c0f) }, 937 { USB_DEVICE(0x07d1, 0x3c0f) },
936 { USB_DEVICE(0x07d1, 0x3c11) }, 938 { USB_DEVICE(0x07d1, 0x3c11) },
939 { USB_DEVICE(0x07d1, 0x3c13) },
940 { USB_DEVICE(0x07d1, 0x3c15) },
937 { USB_DEVICE(0x07d1, 0x3c16) }, 941 { USB_DEVICE(0x07d1, 0x3c16) },
938 /* Draytek */ 942 /* Draytek */
939 { USB_DEVICE(0x07fa, 0x7712) }, 943 { USB_DEVICE(0x07fa, 0x7712) },
@@ -943,6 +947,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
943 { USB_DEVICE(0x7392, 0x7711) }, 947 { USB_DEVICE(0x7392, 0x7711) },
944 { USB_DEVICE(0x7392, 0x7717) }, 948 { USB_DEVICE(0x7392, 0x7717) },
945 { USB_DEVICE(0x7392, 0x7718) }, 949 { USB_DEVICE(0x7392, 0x7718) },
950 { USB_DEVICE(0x7392, 0x7722) },
946 /* Encore */ 951 /* Encore */
947 { USB_DEVICE(0x203d, 0x1480) }, 952 { USB_DEVICE(0x203d, 0x1480) },
948 { USB_DEVICE(0x203d, 0x14a9) }, 953 { USB_DEVICE(0x203d, 0x14a9) },
@@ -977,6 +982,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
977 { USB_DEVICE(0x1737, 0x0070) }, 982 { USB_DEVICE(0x1737, 0x0070) },
978 { USB_DEVICE(0x1737, 0x0071) }, 983 { USB_DEVICE(0x1737, 0x0071) },
979 { USB_DEVICE(0x1737, 0x0077) }, 984 { USB_DEVICE(0x1737, 0x0077) },
985 { USB_DEVICE(0x1737, 0x0078) },
980 /* Logitec */ 986 /* Logitec */
981 { USB_DEVICE(0x0789, 0x0162) }, 987 { USB_DEVICE(0x0789, 0x0162) },
982 { USB_DEVICE(0x0789, 0x0163) }, 988 { USB_DEVICE(0x0789, 0x0163) },
@@ -1000,9 +1006,13 @@ static struct usb_device_id rt2800usb_device_table[] = {
1000 { USB_DEVICE(0x0db0, 0x871b) }, 1006 { USB_DEVICE(0x0db0, 0x871b) },
1001 { USB_DEVICE(0x0db0, 0x871c) }, 1007 { USB_DEVICE(0x0db0, 0x871c) },
1002 { USB_DEVICE(0x0db0, 0x899a) }, 1008 { USB_DEVICE(0x0db0, 0x899a) },
1009 /* Ovislink */
1010 { USB_DEVICE(0x1b75, 0x3071) },
1011 { USB_DEVICE(0x1b75, 0x3072) },
1003 /* Para */ 1012 /* Para */
1004 { USB_DEVICE(0x20b8, 0x8888) }, 1013 { USB_DEVICE(0x20b8, 0x8888) },
1005 /* Pegatron */ 1014 /* Pegatron */
1015 { USB_DEVICE(0x1d4d, 0x0002) },
1006 { USB_DEVICE(0x1d4d, 0x000c) }, 1016 { USB_DEVICE(0x1d4d, 0x000c) },
1007 { USB_DEVICE(0x1d4d, 0x000e) }, 1017 { USB_DEVICE(0x1d4d, 0x000e) },
1008 { USB_DEVICE(0x1d4d, 0x0011) }, 1018 { USB_DEVICE(0x1d4d, 0x0011) },
@@ -1055,7 +1065,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
1055 /* Sparklan */ 1065 /* Sparklan */
1056 { USB_DEVICE(0x15a9, 0x0006) }, 1066 { USB_DEVICE(0x15a9, 0x0006) },
1057 /* Sweex */ 1067 /* Sweex */
1068 { USB_DEVICE(0x177f, 0x0153) },
1058 { USB_DEVICE(0x177f, 0x0302) }, 1069 { USB_DEVICE(0x177f, 0x0302) },
1070 { USB_DEVICE(0x177f, 0x0313) },
1059 /* U-Media */ 1071 /* U-Media */
1060 { USB_DEVICE(0x157e, 0x300e) }, 1072 { USB_DEVICE(0x157e, 0x300e) },
1061 { USB_DEVICE(0x157e, 0x3013) }, 1073 { USB_DEVICE(0x157e, 0x3013) },
@@ -1139,25 +1151,20 @@ static struct usb_device_id rt2800usb_device_table[] = {
1139 { USB_DEVICE(0x13d3, 0x3322) }, 1151 { USB_DEVICE(0x13d3, 0x3322) },
1140 /* Belkin */ 1152 /* Belkin */
1141 { USB_DEVICE(0x050d, 0x1003) }, 1153 { USB_DEVICE(0x050d, 0x1003) },
1142 { USB_DEVICE(0x050d, 0x825a) },
1143 /* Buffalo */ 1154 /* Buffalo */
1144 { USB_DEVICE(0x0411, 0x012e) }, 1155 { USB_DEVICE(0x0411, 0x012e) },
1145 { USB_DEVICE(0x0411, 0x0148) }, 1156 { USB_DEVICE(0x0411, 0x0148) },
1146 { USB_DEVICE(0x0411, 0x0150) }, 1157 { USB_DEVICE(0x0411, 0x0150) },
1147 { USB_DEVICE(0x0411, 0x015d) },
1148 /* Corega */ 1158 /* Corega */
1149 { USB_DEVICE(0x07aa, 0x0041) }, 1159 { USB_DEVICE(0x07aa, 0x0041) },
1150 { USB_DEVICE(0x07aa, 0x0042) }, 1160 { USB_DEVICE(0x07aa, 0x0042) },
1151 { USB_DEVICE(0x18c5, 0x0008) }, 1161 { USB_DEVICE(0x18c5, 0x0008) },
1152 /* D-Link */ 1162 /* D-Link */
1153 { USB_DEVICE(0x07d1, 0x3c0b) }, 1163 { USB_DEVICE(0x07d1, 0x3c0b) },
1154 { USB_DEVICE(0x07d1, 0x3c13) },
1155 { USB_DEVICE(0x07d1, 0x3c15) },
1156 { USB_DEVICE(0x07d1, 0x3c17) }, 1164 { USB_DEVICE(0x07d1, 0x3c17) },
1157 { USB_DEVICE(0x2001, 0x3c17) }, 1165 { USB_DEVICE(0x2001, 0x3c17) },
1158 /* Edimax */ 1166 /* Edimax */
1159 { USB_DEVICE(0x7392, 0x4085) }, 1167 { USB_DEVICE(0x7392, 0x4085) },
1160 { USB_DEVICE(0x7392, 0x7722) },
1161 /* Encore */ 1168 /* Encore */
1162 { USB_DEVICE(0x203d, 0x14a1) }, 1169 { USB_DEVICE(0x203d, 0x14a1) },
1163 /* Fujitsu Stylistic 550 */ 1170 /* Fujitsu Stylistic 550 */
@@ -1173,19 +1180,13 @@ static struct usb_device_id rt2800usb_device_table[] = {
1173 /* LevelOne */ 1180 /* LevelOne */
1174 { USB_DEVICE(0x1740, 0x0605) }, 1181 { USB_DEVICE(0x1740, 0x0605) },
1175 { USB_DEVICE(0x1740, 0x0615) }, 1182 { USB_DEVICE(0x1740, 0x0615) },
1176 /* Linksys */
1177 { USB_DEVICE(0x1737, 0x0078) },
1178 /* Logitec */ 1183 /* Logitec */
1179 { USB_DEVICE(0x0789, 0x0168) }, 1184 { USB_DEVICE(0x0789, 0x0168) },
1180 { USB_DEVICE(0x0789, 0x0169) }, 1185 { USB_DEVICE(0x0789, 0x0169) },
1181 /* Motorola */ 1186 /* Motorola */
1182 { USB_DEVICE(0x100d, 0x9032) }, 1187 { USB_DEVICE(0x100d, 0x9032) },
1183 /* Ovislink */
1184 { USB_DEVICE(0x1b75, 0x3071) },
1185 { USB_DEVICE(0x1b75, 0x3072) },
1186 /* Pegatron */ 1188 /* Pegatron */
1187 { USB_DEVICE(0x05a6, 0x0101) }, 1189 { USB_DEVICE(0x05a6, 0x0101) },
1188 { USB_DEVICE(0x1d4d, 0x0002) },
1189 { USB_DEVICE(0x1d4d, 0x0010) }, 1190 { USB_DEVICE(0x1d4d, 0x0010) },
1190 /* Planex */ 1191 /* Planex */
1191 { USB_DEVICE(0x2019, 0x5201) }, 1192 { USB_DEVICE(0x2019, 0x5201) },
@@ -1204,9 +1205,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
1204 { USB_DEVICE(0x083a, 0xc522) }, 1205 { USB_DEVICE(0x083a, 0xc522) },
1205 { USB_DEVICE(0x083a, 0xd522) }, 1206 { USB_DEVICE(0x083a, 0xd522) },
1206 { USB_DEVICE(0x083a, 0xf511) }, 1207 { USB_DEVICE(0x083a, 0xf511) },
1207 /* Sweex */
1208 { USB_DEVICE(0x177f, 0x0153) },
1209 { USB_DEVICE(0x177f, 0x0313) },
1210 /* Zyxel */ 1208 /* Zyxel */
1211 { USB_DEVICE(0x0586, 0x341a) }, 1209 { USB_DEVICE(0x0586, 0x341a) },
1212#endif 1210#endif