diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 15:45:33 (GMT) |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 15:45:33 (GMT) |
commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/8139too.c | |
parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
download | linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.xz |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 2a70774..10301d3 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -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; |