summaryrefslogtreecommitdiff
path: root/drivers/net/yellowfin.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/yellowfin.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/yellowfin.c')
-rw-r--r--drivers/net/yellowfin.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index b6b247433709..8746cc7c7088 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -24,8 +24,8 @@
*/
#define DRV_NAME "yellowfin"
-#define DRV_VERSION "2.0"
-#define DRV_RELDATE "Jun 27, 2006"
+#define DRV_VERSION "2.1"
+#define DRV_RELDATE "Sep 11, 2006"
#define PFX DRV_NAME ": "
@@ -1307,8 +1307,6 @@ static void set_rx_mode(struct net_device *dev)
/* Stop the Rx process to change any value. */
iowrite16(cfg_value & ~0x1000, ioaddr + Cnfg);
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
- /* Unconditionally log net taps. */
- printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
iowrite16(0x000F, ioaddr + AddrMode);
} else if ((dev->mc_count > 64) || (dev->flags & IFF_ALLMULTI)) {
/* Too many to filter well, or accept all multicasts. */