Merge branch 'tmp' into upstream

This commit is contained in:
Jeff Garzik
2006-09-12 11:45:33 -04:00
32 changed files with 38 additions and 102 deletions

View File

@@ -90,7 +90,7 @@
*/
#define DRV_NAME "8139too"
#define DRV_VERSION "0.9.27"
#define DRV_VERSION "0.9.28"
#include <linux/module.h>
@@ -2512,9 +2512,6 @@ static void __set_rx_mode (struct net_device *dev)
/* Note: do not reorder, GCC is clever about common statements. */
if (dev->flags & IFF_PROMISC) {
/* Unconditionally log net taps. */
printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
dev->name);
rx_mode =
AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
AcceptAllPhys;