aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-velocity.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-velocity.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r--drivers/net/via-velocity.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index e266db1518e7..f23d207ad3fc 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2109,8 +2109,6 @@ static void velocity_set_multi(struct net_device *dev)
2109 struct dev_mc_list *mclist; 2109 struct dev_mc_list *mclist;
2110 2110
2111 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 2111 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
2112 /* Unconditionally log net taps. */
2113 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
2114 writel(0xffffffff, &regs->MARCAM[0]); 2112 writel(0xffffffff, &regs->MARCAM[0]);
2115 writel(0xffffffff, &regs->MARCAM[4]); 2113 writel(0xffffffff, &regs->MARCAM[4]);
2116 rx_mode = (RCR_AM | RCR_AB | RCR_PROM); 2114 rx_mode = (RCR_AM | RCR_AB | RCR_PROM);