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

5
drivers/net/epic100.c
View File

@@ -26,8 +26,8 @@
*/
#define DRV_NAME "epic100"
#define DRV_VERSION "2.0"
#define DRV_RELDATE "June 27, 2006"
#define DRV_VERSION "2.1"
#define DRV_RELDATE "Sept 11, 2006"
/* The user-configurable values.
These may be modified when a driver module is loaded.*/
@@ -1386,7 +1386,6 @@ static void set_rx_mode(struct net_device *dev)
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
outl(0x002C, ioaddr + RxCtrl);
/* Unconditionally log net taps. */
printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
memset(mc_filter, 0xff, sizeof(mc_filter));
} else if ((dev->mc_count > 0) || (dev->flags & IFF_ALLMULTI)) {
/* There is apparently a chip bug, so the multicast filter