aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2008-01-09 22:16:58 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:33 -0500
commit17f65f814fc6144e61b5d19f8e0627cd781486c2 (patch)
treef5bff29b318daabf7de318771610a2bea1125229
parentf31800d8b79bc42e495070aa6e6425841b7bdcbf (diff)
hostap_cs: don't match revisions in presense of the MAC chip name
If the third PCMCIA ID string specifies the MAC chip, the fourth ID string doesn't need to be matched. Even if it's different, it will be compatible with the driver. This ensures that other different revisions of the card will be supported. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 877d3bdd37a0..07593803065a 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -845,15 +845,13 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
845 0x4b801a17), 845 0x4b801a17),
846 PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 846 PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
847 0x7a954bd9, 0x74be00c6), 847 0x7a954bd9, 0x74be00c6),
848 PCMCIA_DEVICE_PROD_ID1234( 848 PCMCIA_DEVICE_PROD_ID123(
849 "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", 849 "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
850 "Eval-RevA", 850 0x4b801a17, 0x6345a0bf, 0xc9049a39),
851 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
852 /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */ 851 /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */
853 PCMCIA_DEVICE_PROD_ID1234( 852 PCMCIA_DEVICE_PROD_ID123(
854 "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", 853 "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10",
855 "A3", 854 0x1a424a1c, 0x6ea57632, 0xdd97a26b),
856 0x1a424a1c, 0x6ea57632, 0xdd97a26b, 0x56b21f52),
857 PCMCIA_DEVICE_PROD_ID123( 855 PCMCIA_DEVICE_PROD_ID123(
858 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", 856 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
859 0xe6ec52ce, 0x08649af2, 0x4b74baa0), 857 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
@@ -890,10 +888,9 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
890 PCMCIA_DEVICE_PROD_ID123( 888 PCMCIA_DEVICE_PROD_ID123(
891 "corega", "WL PCCL-11", "ISL37300P", 889 "corega", "WL PCCL-11", "ISL37300P",
892 0xa21501a, 0x59868926, 0xc9049a39), 890 0xa21501a, 0x59868926, 0xc9049a39),
893 PCMCIA_DEVICE_PROD_ID1234( 891 PCMCIA_DEVICE_PROD_ID123(
894 "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P", 892 "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P",
895 "RevA", 893 0xa5f472c2, 0x9c05598d, 0xc9049a39),
896 0xa5f472c2, 0x9c05598d, 0xc9049a39, 0x57a66194),
897 PCMCIA_DEVICE_NULL 894 PCMCIA_DEVICE_NULL
898}; 895};
899MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); 896MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);