Re: [PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f, 0x0000 conflicts with pcnet_cs

[Dominik Brodowski <linux@dominikbrodowski.net>]

Hi Pavel,

On Fri, Jun 30, 2006 at 05:18:43PM -0400, Pavel Roskin wrote:
> On Fri, 2006-06-30 at 21:59 +0200, Dominik Brodowski wrote:
> > -	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
> > +/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */
> 
> That's fine if we also add symbolic names.  I could identify two
> hostap_cs compatible cards using this ID :
> 
> card "Allied Telesyn AT-WCL452"
>  version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver.
> 1.00"
>  manfid 0xc00f, 0x0000
>  bind "hostap_cs"
> 
> card "corega WL PCCL-11"
>  version "corega", "WL PCCL-11", "ISL37300P", "RevA"
>  manfid 0xc00f, 0x0000
>  bind "hostap_cs"

Like this?

From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 2 Jul 2006 21:21:51 +0200
Subject: [PATCH] pcmcia: add more IDs to hostap_cs.c

As a replacement for the broad manufactor/card ID match we commented out
because of conflicts with pcnet_cs, add two product ID matches.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/net/wireless/hostap/hostap_cs.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 52e6df5..f39d735 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -886,6 +886,13 @@ static struct pcmcia_device_id hostap_cs
 	PCMCIA_DEVICE_PROD_ID123(
 		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
 		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
+	PCMCIA_DEVICE_PROD_ID123(
+		"Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio",
+		"Ver. 1.00",
+		0x5cd01705, 0x4271660f, 0x9d08ee12),
+	PCMCIA_DEVICE_PROD_ID1234(
+		"corega", "WL PCCL-11", "ISL37300P", "RevA",
+		0xa21501a, 0x59868926, 0xc9049a39, 0x57a66194),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
-- 
1.4.0