diff options
Diffstat (limited to 'drivers/net/lance.c')
-rw-r--r-- | drivers/net/lance.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index c1c3452c90ca..dc997be44ed7 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -42,7 +42,7 @@ | |||
42 | Vesselin Kostadinov <vesok at yahoo dot com > - 22/4/2004 | 42 | Vesselin Kostadinov <vesok at yahoo dot com > - 22/4/2004 |
43 | */ | 43 | */ |
44 | 44 | ||
45 | static const char version[] = "lance.c:v1.15ac 1999/11/13 dplatt@3do.com, becker@cesdis.gsfc.nasa.gov\n"; | 45 | static const char version[] = "lance.c:v1.16 2006/11/09 dplatt@3do.com, becker@cesdis.gsfc.nasa.gov\n"; |
46 | 46 | ||
47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
@@ -326,7 +326,7 @@ MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); | |||
326 | MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)"); | 326 | MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)"); |
327 | MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)"); | 327 | MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)"); |
328 | 328 | ||
329 | int init_module(void) | 329 | int __init init_module(void) |
330 | { | 330 | { |
331 | struct net_device *dev; | 331 | struct net_device *dev; |
332 | int this_dev, found = 0; | 332 | int this_dev, found = 0; |
@@ -1281,8 +1281,6 @@ static void set_multicast_list(struct net_device *dev) | |||
1281 | outw(0x0004, ioaddr+LANCE_DATA); /* Temporarily stop the lance. */ | 1281 | outw(0x0004, ioaddr+LANCE_DATA); /* Temporarily stop the lance. */ |
1282 | 1282 | ||
1283 | if (dev->flags&IFF_PROMISC) { | 1283 | if (dev->flags&IFF_PROMISC) { |
1284 | /* Log any net taps. */ | ||
1285 | printk("%s: Promiscuous mode enabled.\n", dev->name); | ||
1286 | outw(15, ioaddr+LANCE_ADDR); | 1284 | outw(15, ioaddr+LANCE_ADDR); |
1287 | outw(0x8000, ioaddr+LANCE_DATA); /* Set promiscuous mode */ | 1285 | outw(0x8000, ioaddr+LANCE_DATA); /* Set promiscuous mode */ |
1288 | } else { | 1286 | } else { |