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/via-rhine.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/via-rhine.c')
| -rw-r--r-- | drivers/net/via-rhine.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index efeb10b9c61b..f7bc44f2d96a 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -30,8 +30,8 @@ */ #define DRV_NAME "via-rhine" -#define DRV_VERSION "1.4.1" -#define DRV_RELDATE "July-24-2006" +#define DRV_VERSION "1.4.2" +#define DRV_RELDATE "Sept-11-2006" /* A few user-configurable values. @@ -1679,9 +1679,6 @@ static void rhine_set_rx_mode(struct net_device *dev) u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */ if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ - /* Unconditionally log net taps. */ - printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", - dev->name); rx_mode = 0x1C; iowrite32(0xffffffff, ioaddr + MulticastFilter0); iowrite32(0xffffffff, ioaddr + MulticastFilter1); |