aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139too.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-12 11:45:33 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 11:45:33 -0400
commit4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch)
treeeb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/8139too.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r--drivers/net/8139too.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 2a707747ed8e..10301d3daa7d 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -90,7 +90,7 @@
90*/ 90*/
91 91
92#define DRV_NAME "8139too" 92#define DRV_NAME "8139too"
93#define DRV_VERSION "0.9.27" 93#define DRV_VERSION "0.9.28"
94 94
95 95
96#include <linux/module.h> 96#include <linux/module.h>
@@ -2512,9 +2512,6 @@ static void __set_rx_mode (struct net_device *dev)
2512 2512
2513 /* Note: do not reorder, GCC is clever about common statements. */ 2513 /* Note: do not reorder, GCC is clever about common statements. */
2514 if (dev->flags & IFF_PROMISC) { 2514 if (dev->flags & IFF_PROMISC) {
2515 /* Unconditionally log net taps. */
2516 printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
2517 dev->name);
2518 rx_mode = 2515 rx_mode =
2519 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 2516 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
2520 AcceptAllPhys; 2517 AcceptAllPhys;