Skip to contentSkip to conversation

new pcmcia IDs for hostap - NETGEAR MA701

PATCH In review Marcin Juszkiewicz 4 participants 9 messages May 16, 2006 – May 17, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 3/6 new pcmcia IDs for hostap - NETGEAR MA701

One more Prism2 card which works with HostAP.

Platform: Sharp Zaurus SL-5500 running 2.4.18 + hostap_cs 0.4.7

root@collie:~# cardctl ident
Socket 0:
  product info: "NETGEAR", "MA701 Wireless CF Card", ""
  manfid: 0xd601, 0x0002
  function: 6 (network)
root@collie:~# iwconfig wlan0
wlan0     Link encap:Ethernet  HWaddr 00:0F:B5:DE:41:CE
          inet addr:135.82.8.139  Bcast:135.82.255.255  Mask:255.255.255.0
          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
          RX packets:56 errors:0 dropped:0 overruns:0 frame:0
          TX packets:40 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0
          RX bytes:7449 (7.2 KiB)  TX bytes:7250 (7.0 KiB)
          Interrupt:35
---
 drivers/net/wireless/hostap/hostap_cs.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
--- linux.orig/drivers/net/wireless/hostap/hostap_cs.c 2006-05-16
16:09:26.000000000 +0200
+++ linux/drivers/net/wireless/hostap/hostap_cs.c 2006-05-16
16:10:35.000000000 +0200
@@ -927,6 +927,8 @@
0x78fc06ee, 0x45a50c1e, 0xa57adb8c, 0x00000000),
PCMCIA_DEVICE_PROD_ID12("D-Link", "DCF-660W",
0x1a424a1c, 0xe78b6dcc),
+ PCMCIA_DEVICE_PROD_ID12("NETGEAR", "MA701 Wireless CF Card",
+ 0x9aa79dc3, 0xd9ec98e),
PCMCIA_DEVICE_NULL
};
MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);

Signature · 5 lines
JID: hrw-jabber.org
Sharp Zaurus C-760 (OZ 3.5.x)
OpenEmbedded/OpenZaurus/OPIE developer

           Press any key to continue... No, no, NOT *THAT* ONE!
#1 lore raw
Quoted 1 line · Marcin Juszkiewicz

One more Prism2 card which works with HostAP.

Please roll these into a single patch. There's no need to split it up such that there is one ID per patch.

Jeff

#2 lore raw
Quoted 5 lines · Jeff Garzik
Quoted 1 line · Marcin Juszkiewicz

One more Prism2 card which works with HostAP.

Please roll these into a single patch. There's no need to split it up such that there is one ID per patch.

drivers/net/wireless/hostap/hostap_cs.c +15 -0
Index: netdev-2.6/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
@@ -881,6 +881,21 @@
 	PCMCIA_DEVICE_PROD_ID12(
 		"ZoomAir 11Mbps High", "Rate wireless Networking",
 		0x273fe3db, 0x32a1eaee),
+	PCMCIA_DEVICE_PROD_ID1234("ASUS", "802_11B_CF_CARD_25", "Version 01.00", "",
+		0x78fc06ee, 0x45a50c1e, 0xa57adb8c, 0x00000000),
+	PCMCIA_DEVICE_PROD_ID12("D-Link", "DCF-660W",
+		0x1a424a1c, 0xe78b6dcc),
+	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "MA701 Wireless CF Card",
+		0x9aa79dc3, 0xd9ec98e),
+	PCMCIA_DEVICE_PROD_ID12("PLANEX COMMUNICATION INC", 
+			"PLANEX GW-CF11X Wireless CF Card",
+			0x4703cf68, 0xfad7318d),
+	PCMCIA_DEVICE_PROD_ID123(
+			"Pretec", "CompactWLAN Card 802.11b", "2.5",
+			0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+	PCMCIA_DEVICE_PROD_ID1234(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0, 0x00000000),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
Signature · 6 lines
JID: hrw-jabber.org
Sharp Zaurus C-760 (OZ 3.5.x)
OpenEmbedded/OpenZaurus/OPIE developer

                        If it works, don't fix it.
                        		-- Sam Rayburn
#3 lore raw

drivers/net/wireless/hostap/hostap_cs.c

Quoted 10 lines · Marcin Juszkiewicz
Quoted 4 lines · Jeff Garzik
Quoted 1 line · Marcin Juszkiewicz

One more Prism2 card which works with HostAP.

Please roll these into a single patch. There's no need to split it up such that there is one ID per patch.

Index: netdev-2.6/drivers/net/wireless/hostap/hostap_cs.c
===================================================================

drivers/net/wireless/hostap/hostap_cs.c +0 -0

Thanks, but you violated rules #6, #5, and #2 of
http://linux.yyz.us/patch-format.html

Also, make sure to CC John Linville, as he's the one who will actually be applying your patch.

Regards,

Jeff

#4 lore raw

Re: [PATCH 3/6] new pcmcia IDs for hostap

In reply to Jeff Garzik
Quoted 5 lines · Jeff Garzik
Quoted 1 line · Marcin Juszkiewicz

One more Prism2 card which works with HostAP.

Please roll these into a single patch. There's no need to split it up such that there is one ID per patch.

Here's another card that would benefit from a hostap driver:

Platform: HP Ipaq hx4700 running 2.6.16-hh

root@ipaq-pxa270:~# pccardctl ident
Socket 0:
  product info: "ASUS", "802_11B_CF_CARD_25", "Version 01.00", ""
  manfid: 0x02aa, 0x0002
  function: 6 (network)

==========================================================================
I use D-Link DCF-660W card with WPA protected network. By default orinoco_cs was loaded for my card so I was not able to connect. This patch make my card working with hostap_cs (like it was when I used pcmcia-cs). Card was used with hostap_cs during last year in two Zaurus models (2.4.18 on one and 2.6.11 - 2.6.16 on another).

Platform: Sharp Zaurus C760 running 2.6.16 and pcmciautils 013.

root@c7x0:~# pccardctl ident
Socket 0:
  product info: "D-Link", "DCF-660W", "", ""
  manfid: 0xd601, 0x0005
  function: 6 (network)

==========================================================================
One more Prism2 card which works with HostAP.

Platform: Sharp Zaurus SL-5500 running 2.4.18 + hostap_cs 0.4.7

root@collie:~# cardctl ident
Socket 0:
  product info: "NETGEAR", "MA701 Wireless CF Card", ""
  manfid: 0xd601, 0x0002
  function: 6 (network)

==========================================================================
Platform: Sharp Zaurus SL-C3100 running 2.6.16 + pcmciautils 013

root@spitz:~# pccardctl ident
Socket 0:
  product info: "HITACHI", "microdrive", "", ""
  manfid: 0x0319, 0x0000
  function: 4 (fixed disk)
Socket 1:
  product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", ""
  manfid: 0xd601, 0x0010
  function: 6 ( network )

==========================================================================
From: Jochen Friedrich

Yet another card known to work OK with hostap_cs:

# pccardctl ident
Socket 0:
  no product info available
Socket 1:
  product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
  manfid: 0x0156, 0x0002
  function: 6 (network)

==========================================================================

 drivers/net/wireless/hostap/hostap_cs.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/net/wireless/hostap/hostap_cs.c +15 -0
Index: netdev-2.6/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
@@ -881,6 +881,21 @@
 	PCMCIA_DEVICE_PROD_ID12(
 		"ZoomAir 11Mbps High", "Rate wireless Networking",
 		0x273fe3db, 0x32a1eaee),
+	PCMCIA_DEVICE_PROD_ID1234("ASUS", "802_11B_CF_CARD_25", "Version 01.00", "",
+		0x78fc06ee, 0x45a50c1e, 0xa57adb8c, 0x00000000),
+	PCMCIA_DEVICE_PROD_ID12("D-Link", "DCF-660W",
+		0x1a424a1c, 0xe78b6dcc),
+	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "MA701 Wireless CF Card",
+		0x9aa79dc3, 0xd9ec98e),
+	PCMCIA_DEVICE_PROD_ID12("PLANEX COMMUNICATION INC", 
+		"PLANEX GW-CF11X Wireless CF Card",
+		0x4703cf68, 0xfad7318d),
+	PCMCIA_DEVICE_PROD_ID123(
+		"Pretec", "CompactWLAN Card 802.11b", "2.5",
+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+	PCMCIA_DEVICE_PROD_ID1234(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0, 0x00000000),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
Signature · 6 lines
JID: hrw-jabber.org
Sharp Zaurus C-760 (OZ 3.5.x)
OpenEmbedded/OpenZaurus/OPIE developer

        "To be or not to be that is the question.":
         every programmer knows the answer $2b or (not $2b) is $ff.
#5 lore raw

Re: [PATCH 3/6] new pcmcia IDs for hostap

Hello!

Quoted 5 lines · Marcin Juszkiewicz
root@c7x0:~# pccardctl ident
Socket 0:
  product info: "D-Link", "DCF-660W", "", ""
  manfid: 0xd601, 0x0005
  function: 6 (network)

This manfid is in the driver already, and it also covers ZCOMAX XI-325HP 200mw cards, according to
http://tinyshell.be/aircrackng/patches/hostap-driver-0.4.7.patch

Quoted 9 lines

One more Prism2 card which works with HostAP.

Platform: Sharp Zaurus SL-5500 running 2.4.18 + hostap_cs 0.4.7

root@collie:~# cardctl ident
Socket 0:
  product info: "NETGEAR", "MA701 Wireless CF Card", ""
  manfid: 0xd601, 0x0002
  function: 6 (network)

This manfid is in the driver too.

Quoted 11 lines

Platform: Sharp Zaurus SL-C3100 running 2.6.16 + pcmciautils 013

root@spitz:~# pccardctl ident
Socket 0:
  product info: "HITACHI", "microdrive", "", ""
  manfid: 0x0319, 0x0000
  function: 4 (fixed disk)
Socket 1:
  product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", ""
  manfid: 0xd601, 0x0010
  function: 6 ( network )

This manfid is in the driver.

Quoted 11 lines

From: Jochen Friedrich

Yet another card known to work OK with hostap_cs:

# pccardctl ident
Socket 0:
  no product info available
Socket 1:
  product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
  manfid: 0x0156, 0x0002
  function: 6 (network)

Yes, that's needed. I was thinking maybe we could have a macro to match manfid and the third string. 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards.

drivers/net/wireless/hostap/hostap_cs.c line 885

Quoted 2 lines
drivers/net/wireless/hostap/hostap_cs.c +2 -0
+	PCMCIA_DEVICE_PROD_ID1234("ASUS", "802_11B_CF_CARD_25", "Version 01.00", "",
+		0x78fc06ee, 0x45a50c1e, 0xa57adb8c, 0x00000000),

I think it would be better to omit the empty string. It's mostly a matter of taste, but if there are cards with the same ID except the fourth string, they would be almost definitely compatible.

This entry shouldn't be needed because the manfid 0x02aa, 0x0002 is already in the driver.

drivers/net/wireless/hostap/hostap_cs.c line 887

Quoted 2 lines
drivers/net/wireless/hostap/hostap_cs.c +2 -0
+	PCMCIA_DEVICE_PROD_ID12("D-Link", "DCF-660W",
+		0x1a424a1c, 0xe78b6dcc),

It shouldn't be needed (manfid 0xd601, 0x0005 is in the driver)

drivers/net/wireless/hostap/hostap_cs.c line 889

Quoted 2 lines
drivers/net/wireless/hostap/hostap_cs.c +2 -0
+	PCMCIA_DEVICE_PROD_ID12("NETGEAR", "MA701 Wireless CF Card",
+		0x9aa79dc3, 0xd9ec98e),

Same thing (0xd601, 0x0002)

drivers/net/wireless/hostap/hostap_cs.c line 892

Quoted 3 lines
drivers/net/wireless/hostap/hostap_cs.c +3 -0
+	PCMCIA_DEVICE_PROD_ID12("PLANEX COMMUNICATION INC", 
+		"PLANEX GW-CF11X Wireless CF Card",
+		0x4703cf68, 0xfad7318d),

Same thing (0xd601, 0x0010), according to
http://www.oesf.org/forums/index.php?showtopic=14544

drivers/net/wireless/hostap/hostap_cs.c line 895

Quoted 3 lines
drivers/net/wireless/hostap/hostap_cs.c +3 -0
+	PCMCIA_DEVICE_PROD_ID123(
+		"Pretec", "CompactWLAN Card 802.11b", "2.5",
+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),

That's a good one.

drivers/net/wireless/hostap/hostap_cs.c line 898

Quoted 3 lines
drivers/net/wireless/hostap/hostap_cs.c +3 -0
+	PCMCIA_DEVICE_PROD_ID1234(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0, 0x00000000),

Another useful entry, but please don't match the empty string.

Signature · 2 lines
Regards,
Pavel Roskin
#6 lore raw

Re: [PATCH 3/6] new pcmcia IDs for hostap

Quoted 6 lines · Pavel Roskin
Quoted 2 lines · Marcin Juszkiewicz

product info: "D-Link", "DCF-660W", "", ""
manfid: 0xd601, 0x0005

This manfid is in the driver already,

dropped then

Quoted 4 lines
Quoted 2 lines

product info: "NETGEAR", "MA701 Wireless CF Card", ""
manfid: 0xd601, 0x0002

This manfid is in the driver too.

dropped

Quoted 4 lines
Quoted 2 lines

product info:"PLANEX COMMUNICATION INC", "PLANEX GW-CF11X Wireless CF Card", "", ""
manfid: 0xd601, 0x0010

This manfid is in the driver.

dropped

Quoted 14 lines
Quoted 2 lines

product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
manfid: 0x0156, 0x0002

Yes, that's needed. I was thinking maybe we could have a macro to match manfid and the third string. 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards.

Review

Quoted 2 lines
(quoted diff) +2 -0
+	PCMCIA_DEVICE_PROD_ID1234("ASUS", "802_11B_CF_CARD_25", "Version 01.00", "",
+		0x78fc06ee, 0x45a50c1e, 0xa57adb8c, 0x00000000), 

I think it would be better to omit the empty string. It's mostly a matter of taste, but if there are cards with the same ID except the fourth string, they would be almost definitely compatible.

Quoted 2 lines

This entry shouldn't be needed because the manfid 0x02aa, 0x0002 is already in the driver.

dropped

Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+	PCMCIA_DEVICE_PROD_ID123(
+		"Pretec", "CompactWLAN Card 802.11b", "2.5",
+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),

That's a good one.

That one I sent to You, lkml over month ago but you had it already in 24-hostap_cs_id.diff patch (which you told later to ignore).

Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+	PCMCIA_DEVICE_PROD_ID1234(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0, 0x00000000),

Another useful entry, but please don't match the empty string.

updated:

Platform: Sharp Zaurus C760 running 2.6.16 and pcmciautils 013.

root@c7x0:~# pccardctl ident
Socket 0:
  product info: "Pretec", "CompactWLAN Card 802.11b", "2.5"
  manfid: 0x0156, 0x0002
  function: 6 (network)

==========================================================================
From: Jochen Friedrich

Yet another card known to work OK with hostap_cs:

# pccardctl ident
Socket 0:
  no product info available
Socket 1:
  product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
  manfid: 0x0156, 0x0002
  function: 6 (network)

==========================================================================

 drivers/net/wireless/hostap/hostap_cs.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/wireless/hostap/hostap_cs.c +6 -0
Index: linux/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
@@ -923,6 +923,12 @@
 	PCMCIA_DEVICE_PROD_ID12(
 		"ZoomAir 11Mbps High", "Rate wireless Networking",
 		0x273fe3db, 0x32a1eaee),
+	PCMCIA_DEVICE_PROD_ID123(
+		"Pretec", "CompactWLAN Card 802.11b", "2.5",
+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+	PCMCIA_DEVICE_PROD_ID123(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
Signature · 6 lines
JID: hrw-jabber.org
Sharp Zaurus C-760 (OZ 3.5.x)
OpenEmbedded/OpenZaurus/OPIE developer

   Fear leads to anger, anger leads to hate, hate... leads to suffering.
   		-- Yoda
#7 lore raw

Re: [PATCH 3/6] new pcmcia IDs for hostap

Quoted 21 lines · Marcin Juszkiewicz

Platform: Sharp Zaurus C760 running 2.6.16 and pcmciautils 013.

root@c7x0:~# pccardctl ident
Socket 0:
  product info: "Pretec", "CompactWLAN Card 802.11b", "2.5"
  manfid: 0x0156, 0x0002
  function: 6 (network)

==========================================================================
From: Jochen Friedrich

Yet another card known to work OK with hostap_cs:

# pccardctl ident
Socket 0:
  no product info available
Socket 1:
  product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", ""
  manfid: 0x0156, 0x0002
  function: 6 (network)
Quoted 3 lines

==========================================================================

If everyone is happy w/ this version of the patch, then please clean-up the changelog appropriately and repost it cleanly according to the format described here:

http://linux.yyz.us/patch-format.html

Thanks,

John

P.S. I think all that pccardctl output is overkill for the changelog entry. Simply name the cards covered by the patch.

Signature · 2 lines
John W. Linville
[email protected]
#8 lore raw

Re: [PATCH 3/6] new pcmcia IDs for hostap

In reply to Marcin Juszkiewicz
Quoted 2 lines · Marcin Juszkiewicz

That one I sent to You, lkml over month ago but you had it already in 24-hostap_cs_id.diff patch (which you told later to ignore).

Sorry, I was swamped with other things and didn't have time to recheck all entries.

Quoted 1 line
Quoted 22 lines
 drivers/net/wireless/hostap/hostap_cs.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: linux/drivers/net/wireless/hostap/hostap_cs.c
===================================================================

drivers/net/wireless/hostap/hostap_cs.c +6 -0
@@ -923,6 +923,12 @@
 	PCMCIA_DEVICE_PROD_ID12(
 		"ZoomAir 11Mbps High", "Rate wireless Networking",
 		0x273fe3db, 0x32a1eaee),
+	PCMCIA_DEVICE_PROD_ID123(
+		"Pretec", "CompactWLAN Card 802.11b", "2.5",
+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+	PCMCIA_DEVICE_PROD_ID123(
+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
+		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
Signature · 2 lines
Regards,
Pavel Roskin