Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e58a93 authored by Pavel Roskin's avatar Pavel Roskin Committed by Dominik Brodowski
Browse files

orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002 



Without CONFIG_HERMES_PRISM, only match cards that have "Version 01.01"
as the third product ID.  Those have Agere firmware.

With CONFIG_HERMES_PRISM, match all 0x0156:0x0002 cards.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 0a1013c7

drivers/net/wireless/orinoco/orinoco_cs.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -239,7 +239,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link) 




static const struct pcmcia_device_id orinoco_cs_ids[] = {

static const struct pcmcia_device_id orinoco_cs_ids[] = {

	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */

	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */

	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */

	PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */

	PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */

	PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */

	PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */

	PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */

	PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */
@@ -272,6 +271,7 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),

	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),

	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),

	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),

	PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),

	PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),

	PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.01", 0xd27deb1a), /* Lucent Orinoco */

#ifdef CONFIG_HERMES_PRISM

#ifdef CONFIG_HERMES_PRISM

	/* Only entries that certainly identify Prism chipset */

	/* Only entries that certainly identify Prism chipset */

	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */

	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */
@@ -321,6 +321,9 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { 
	PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),

	PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),

	PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),

	PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),

	PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),

	PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),



	/* This may be Agere or Intersil Firmware */

	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),

#endif

#endif

	PCMCIA_DEVICE_NULL,

	PCMCIA_DEVICE_NULL,

};

};