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

6
drivers/net/sundance.c
View File

@ -23,8 +23,8 @@
*/
#define DRV_NAME "sundance"
#define DRV_VERSION "1.1"
#define DRV_RELDATE "27-Jun-2006"
#define DRV_VERSION "1.2"
#define DRV_RELDATE "11-Sep-2006"
/* The user-configurable values.
@ -1464,8 +1464,6 @@ static void set_rx_mode(struct net_device *dev)
int i;
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
/* Unconditionally log net taps. */
printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
memset(mc_filter, 0xff, sizeof(mc_filter));
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys;
} else if ((dev->mc_count > multicast_filter_limit)