aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-rhine.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/via-rhine.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r--drivers/net/via-rhine.c7
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 @@
30*/ 30*/
31 31
32#define DRV_NAME "via-rhine" 32#define DRV_NAME "via-rhine"
33#define DRV_VERSION "1.4.1" 33#define DRV_VERSION "1.4.2"
34#define DRV_RELDATE "July-24-2006" 34#define DRV_RELDATE "Sept-11-2006"
35 35
36 36
37/* A few user-configurable values. 37/* A few user-configurable values.
@@ -1679,9 +1679,6 @@ static void rhine_set_rx_mode(struct net_device *dev)
1679 u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */ 1679 u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
1680 1680
1681 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1681 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1682 /* Unconditionally log net taps. */
1683 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
1684 dev->name);
1685 rx_mode = 0x1C; 1682 rx_mode = 0x1C;
1686 iowrite32(0xffffffff, ioaddr + MulticastFilter0); 1683 iowrite32(0xffffffff, ioaddr + MulticastFilter0);
1687 iowrite32(0xffffffff, ioaddr + MulticastFilter1); 1684 iowrite32(0xffffffff, ioaddr + MulticastFilter1);