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

Commit 0b45d186 authored by Komuro's avatar Komuro Committed by Jeff Garzik
Browse files

PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code 



Dear Jeff

Subject: [PATCH] xirc2ps_cs: bugfix of multicast code

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

drivers/net/pcmcia/xirc2ps_cs.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -1420,7 +1420,7 @@ set_addresses(struct net_device *dev) 
    kio_addr_t ioaddr = dev->base_addr;

    kio_addr_t ioaddr = dev->base_addr;

    local_info_t *lp = netdev_priv(dev);

    local_info_t *lp = netdev_priv(dev);

    struct dev_mc_list *dmi = dev->mc_list;

    struct dev_mc_list *dmi = dev->mc_list;

    char *addr;

    unsigned char *addr;

    int i,j,k,n;

    int i,j,k,n;





    SelectPage(k=0x50);

    SelectPage(k=0x50);
@@ -1429,6 +1429,9 @@ set_addresses(struct net_device *dev) 
	    if (++n > 9)

	    if (++n > 9)

		break;

		break;

	    i = 0;

	    i = 0;

	    if (n > 1 && n <= dev->mc_count && dmi) {

	   	 dmi = dmi->next;

	    }

	}

	}

	if (j > 15) {

	if (j > 15) {

	    j = 8;

	    j = 8;
@@ -1436,10 +1439,9 @@ set_addresses(struct net_device *dev) 
	    SelectPage(k);

	    SelectPage(k);

	}

	}





	if (n && n <= dev->mc_count && dmi) {

	if (n && n <= dev->mc_count && dmi)

	    addr = dmi->dmi_addr;

	    addr = dmi->dmi_addr;

	    dmi = dmi->next;

	else

	} else

	    addr = dev->dev_addr;

	    addr = dev->dev_addr;





	if (lp->mohawk)

	if (lp->mohawk)
@@ -1465,10 +1467,10 @@ set_multicast_list(struct net_device *dev) 
    if (dev->flags & IFF_PROMISC) { /* snoop */

    if (dev->flags & IFF_PROMISC) { /* snoop */

	PutByte(XIRCREG42_SWC1, 0x06); /* set MPE and PME */

	PutByte(XIRCREG42_SWC1, 0x06); /* set MPE and PME */

    } else if (dev->mc_count > 9 || (dev->flags & IFF_ALLMULTI)) {

    } else if (dev->mc_count > 9 || (dev->flags & IFF_ALLMULTI)) {

	PutByte(XIRCREG42_SWC1, 0x06); /* set MPE */

	PutByte(XIRCREG42_SWC1, 0x02); /* set MPE */

    } else if (dev->mc_count) {

    } else if (dev->mc_count) {

	/* the chip can filter 9 addresses perfectly */

	/* the chip can filter 9 addresses perfectly */

	PutByte(XIRCREG42_SWC1, 0x00);

	PutByte(XIRCREG42_SWC1, 0x01);

	SelectPage(0x40);

	SelectPage(0x40);

	PutByte(XIRCREG40_CMD0, Offline);

	PutByte(XIRCREG40_CMD0, Offline);

	set_addresses(dev);

	set_addresses(dev);