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

Merge branch 'tmp' into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2006-09-12 11:45:33 -04:00
parent c925f1ea9e d5b20697ca
commit 4e83b7fad8
32 changed files with 38 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/via-rhine.c
View File

@@ -30,8 +30,8 @@
*/
#define DRV_NAME "via-rhine"
#define DRV_VERSION "1.4.1"
#define DRV_RELDATE "July-24-2006"
#define DRV_VERSION "1.4.2"
#define DRV_RELDATE "Sept-11-2006"
/* A few user-configurable values.
@@ -1679,9 +1679,6 @@ static void rhine_set_rx_mode(struct net_device *dev)
u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
/* Unconditionally log net taps. */
printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
dev->name);
rx_mode = 0x1C;
iowrite32(0xffffffff, ioaddr + MulticastFilter0);
iowrite32(0xffffffff, ioaddr + MulticastFilter1);