diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/hamachi.c | |
parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r-- | drivers/net/hamachi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 409c6aab041..9927bff75d6 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -27,8 +27,8 @@ */ #define DRV_NAME "hamachi" -#define DRV_VERSION "2.0" -#define DRV_RELDATE "June 27, 2006" +#define DRV_VERSION "2.1" +#define DRV_RELDATE "Sept 11, 2006" /* A few user-configurable values. */ @@ -1851,8 +1851,6 @@ static void set_rx_mode(struct net_device *dev) void __iomem *ioaddr = hmp->base; if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ - /* Unconditionally log net taps. */ - printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name); writew(0x000F, ioaddr + AddrMode); } else if ((dev->mc_count > 63) || (dev->flags & IFF_ALLMULTI)) { /* Too many to match, or accept all multicasts. */ |