lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xirc2ps_cs: re-initialize the multicast address in do_reset

Browse Source 
keep bit7,8 of XIRCREG42_SWC1 in set_multicast_list.

Signed-off-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Komuro
2008-04-20 14:32:34 +09:00
committed by Jeff Garzik
parent f7f312a0c7
commit 43fc63dceb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/pcmcia/xirc2ps_cs.c
View File

@@ -1461,22 +1461,25 @@ static void
set_multicast_list(struct net_device *dev) set_multicast_list(struct net_device *dev)
{ {
unsigned int ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned value;
SelectPage(0x42); SelectPage(0x42);
value = GetByte(XIRCREG42_SWC1) & 0xC0;
if (dev->flags & IFF_PROMISC) { /* snoop */ if (dev->flags & IFF_PROMISC) { /* snoop */
PutByte(XIRCREG42_SWC1, 0x06); /* set MPE and PME */ PutByte(XIRCREG42_SWC1, value | 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, 0x02); /* set MPE */ PutByte(XIRCREG42_SWC1, value | 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, 0x01); PutByte(XIRCREG42_SWC1, value | 0x01);
SelectPage(0x40); SelectPage(0x40);
PutByte(XIRCREG40_CMD0, Offline); PutByte(XIRCREG40_CMD0, Offline);
set_addresses(dev); set_addresses(dev);
SelectPage(0x40); SelectPage(0x40);
PutByte(XIRCREG40_CMD0, EnableRecv | Online); PutByte(XIRCREG40_CMD0, EnableRecv | Online);
} else { /* standard usage */ } else { /* standard usage */
PutByte(XIRCREG42_SWC1, 0x00); PutByte(XIRCREG42_SWC1, value | 0x00);
} }
SelectPage(0); SelectPage(0);
} }
@@ -1722,6 +1725,7 @@ do_reset(struct net_device *dev, int full)
/* enable receiver and put the mac online */ /* enable receiver and put the mac online */
if (full) { if (full) {
set_multicast_list(dev);
SelectPage(0x40); SelectPage(0x40);
PutByte(XIRCREG40_CMD0, EnableRecv | Online); PutByte(XIRCREG40_CMD0, EnableRecv | Online);
} }