aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2010-02-11 17:56:06 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-19 15:51:23 -0500
commitfbc87d67af5ccd733f894273b215564c67e3a749 (patch)
treeb7e85f14de1912fe1e3617db9ecc9a48eca67899 /include/pcmcia
parent64b84010f9f85996a219fcc697396e7e11be3459 (diff)
downloadmrst-s0i3-test-fbc87d67af5ccd733f894273b215564c67e3a749.tar.gz
mrst-s0i3-test-fbc87d67af5ccd733f894273b215564c67e3a749.tar.xz
mrst-s0i3-test-fbc87d67af5ccd733f894273b215564c67e3a749.zip
Introduce PCMCIA_DEVICE_PROD_ID3
...and use it in hostap_cs and orinoco_cs. Another PCMCIA device with Intersil Prism chipset has been reported: Socket 0: product info: "Gigabyte", "GN-WLM01_P25L_ADAPTER", "ISL37300P", "Eval-RevA" manfid: 0x02e0, 0x1011 function: 6 (network) As it's the case with some other Prism based devices, the third ID string contains a design name that should be sufficient to identify the card as having Intersil Prism chipset and thus compatible with both orinoco_cs and hostap_cs. Introduce PCMCIA_DEVICE_PROD_ID3 that matches the third ID string only. Use it in orinoco_cs and hostap_cs to match cards with the third ID string indicating Prism chipset. Remove corresponding entries that use PCMCIA_DEVICE_PROD_ID123. Reported-by: Ozzy <ozzymud@gmail.com> Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/device_id.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h
index c33ea08352b..63e5b8f6b7d 100644
--- a/include/pcmcia/device_id.h
+++ b/include/pcmcia/device_id.h
@@ -34,6 +34,11 @@
.prod_id = { NULL, (v2), NULL, NULL }, \
.prod_id_hash = { 0, (vh2), 0, 0 }, }
+#define PCMCIA_DEVICE_PROD_ID3(v3, vh3) { \
+ .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID3, \
+ .prod_id = { NULL, NULL, (v3), NULL }, \
+ .prod_id_hash = { 0, 0, (vh3), 0 }, }
+
#define PCMCIA_DEVICE_PROD_ID12(v1, v2, vh1, vh2) { \
.match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
PCMCIA_DEV_ID_MATCH_PROD_ID2, \