]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
authorPavel Roskin <proski@gnu.org>
Tue, 26 Jul 2011 22:52:35 +0000 (18:52 -0400)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 29 Jul 2011 15:56:08 +0000 (17:56 +0200)
This is needed to match wireless cards with Intersil firmware that have
ID 0x0156:0x0002 and the third ID "Version 01.02".  Such cards are
currently matched by orinoco_cs, which doesn't support WPA.  They should
be matched by hostap_cs.

The first and the second product ID vary widely, so there are few users
with some particular IDs.  Of those, very few can submit a patch for
hostap_cs or write a useful bugreport.  It's still important to support
their hardware properly.

With PCMCIA_DEVICE_MANF_CARD_PROD_ID3, it should be possible to cover
the remaining Intersil based designs that kept the numeric ID and the
"version" of the reference design.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
include/pcmcia/device_id.h

index 63e5b8f6b7dd303f36105fc230c105330b673544..00dbfac9c6e1b76f447141072ccdb593c0e723c6 100644 (file)
        .prod_id = { (v1), NULL, NULL, NULL }, \
        .prod_id_hash = { (vh1), 0, 0, 0 }, }
 
+#define PCMCIA_DEVICE_MANF_CARD_PROD_ID3(manf, card, v3, vh3) { \
+       .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                       PCMCIA_DEV_ID_MATCH_CARD_ID| \
+                       PCMCIA_DEV_ID_MATCH_PROD_ID3, \
+       .manf_id = (manf), \
+       .card_id = (card), \
+       .prod_id = { NULL, NULL, (v3), NULL }, \
+       .prod_id_hash = { 0, 0, (vh3), 0 }, }
+
 
 /* multi-function devices */