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

Commit 61da96be authored by Komuro's avatar Komuro Committed by Jeff Garzik
Browse files

pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message. 



   * If ConfigBase is 0x03c0 && manfid is (0x0149,0xc1ab),
    printk "use axnet_cs instead" message.

    Actually, most of the card with manfid(0x0149, 0xc1ab)
    use pcnet_cs driver.

   * remove entry (0x021b, 0x0202)

Signed-off-by: default avatarKomuro <komurojun-mbn@nifty.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a80763c9

drivers/net/pcmcia/pcnet_cs.c

+8 −2
Original line number Diff line number Diff line
@@ -590,6 +590,13 @@ static int pcnet_config(struct pcmcia_device *link) 
	dev->if_port = 0;

    }



    if ((link->conf.ConfigBase == 0x03c0)

	&& (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {

	printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");

	printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");

	goto failed;

    }



    local_hw_info = get_hwinfo(link);

    if (local_hw_info == NULL)

	local_hw_info = get_prom(link);
@@ -1567,12 +1574,11 @@ static struct pcmcia_device_id pcnet_ids[] = { 
	PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0145),

	PCMCIA_DEVICE_MANF_CARD(0x0149, 0x0230),

	PCMCIA_DEVICE_MANF_CARD(0x0149, 0x4530),

/*	PCMCIA_DEVICE_MANF_CARD(0x0149, 0xc1ab), conflict with axnet_cs */

	PCMCIA_DEVICE_MANF_CARD(0x0149, 0xc1ab),

	PCMCIA_DEVICE_MANF_CARD(0x0186, 0x0110),

	PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328),

	PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x8041),

	PCMCIA_DEVICE_MANF_CARD(0x0213, 0x2452),

/*	PCMCIA_DEVICE_MANF_CARD(0x021b, 0x0202), conflict with axnet_cs */

	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0300),

	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0307),

	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030a),