aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ioc3-eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ioc3-eth.c')
-rw-r--r--drivers/net/ioc3-eth.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 68d8af7df08e..fbda7614d0ef 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -28,7 +28,7 @@
28 */ 28 */
29 29
30#define IOC3_NAME "ioc3-eth" 30#define IOC3_NAME "ioc3-eth"
31#define IOC3_VERSION "2.6.3-3" 31#define IOC3_VERSION "2.6.3-4"
32 32
33#include <linux/init.h> 33#include <linux/init.h>
34#include <linux/delay.h> 34#include <linux/delay.h>
@@ -1611,8 +1611,6 @@ static void ioc3_set_multicast_list(struct net_device *dev)
1611 netif_stop_queue(dev); /* Lock out others. */ 1611 netif_stop_queue(dev); /* Lock out others. */
1612 1612
1613 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1613 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1614 /* Unconditionally log net taps. */
1615 printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
1616 ip->emcr |= EMCR_PROMISC; 1614 ip->emcr |= EMCR_PROMISC;
1617 ioc3_w_emcr(ip->emcr); 1615 ioc3_w_emcr(ip->emcr);
1618 (void) ioc3_r_emcr(); 1616 (void) ioc3_r_emcr();