aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2006-09-11 17:39:18 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 11:45:19 -0400
commitd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (patch)
treea5fa98145b1d95b84357157856517de8d0e31edf /drivers/net
parent05ff0e291af086f4325bac76abad250690bbbd63 (diff)
[PATCH] Remove more unnecessary driver printk's
As I promised last week, here is the first pass at removing all unnecessary printk's that exist in network device drivers currently in promiscuous mode. The duplicate messages are not needed so they have been removed. Some of these drivers are quite old and might not need an update, but I did them all anyway. I am currently auditing the remaining conditional printk's and will send out a patch for those soon. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c59x.c2
-rw-r--r--drivers/net/8139cp.c4
-rw-r--r--drivers/net/8139too.c5
-rw-r--r--drivers/net/amd8111e.c5
-rw-r--r--drivers/net/ariadne.c2
-rw-r--r--drivers/net/at1700.c4
-rw-r--r--drivers/net/atarilance.c2
-rw-r--r--drivers/net/au1000_eth.c3
-rw-r--r--drivers/net/eepro.c3
-rw-r--r--drivers/net/epic100.c5
-rw-r--r--drivers/net/fealnx.c6
-rw-r--r--drivers/net/fec.c2
-rw-r--r--drivers/net/gianfar.c3
-rw-r--r--drivers/net/hamachi.c6
-rw-r--r--drivers/net/ioc3-eth.c4
-rw-r--r--drivers/net/lance.c4
-rw-r--r--drivers/net/natsemi.c7
-rw-r--r--drivers/net/pci-skeleton.c5
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c4
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c5
-rw-r--r--drivers/net/sb1250-mac.c9
-rw-r--r--drivers/net/sis190.c3
-rw-r--r--drivers/net/sun3lance.c2
-rw-r--r--drivers/net/sundance.c6
-rw-r--r--drivers/net/tulip/tulip_core.c6
-rw-r--r--drivers/net/tulip/winbond-840.c6
-rw-r--r--drivers/net/typhoon.c6
-rw-r--r--drivers/net/ucc_geth.c4
-rw-r--r--drivers/net/via-rhine.c7
-rw-r--r--drivers/net/via-velocity.c2
-rw-r--r--drivers/net/via-velocity.h2
-rw-r--r--drivers/net/yellowfin.c6
32 files changed, 38 insertions, 102 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80e8ca013e44..0586929fae4e 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2928,7 +2928,7 @@ static void set_rx_mode(struct net_device *dev)
2928 int new_mode; 2928 int new_mode;
2929 2929
2930 if (dev->flags & IFF_PROMISC) { 2930 if (dev->flags & IFF_PROMISC) {
2931 if (vortex_debug > 0) 2931 if (vortex_debug > 3)
2932 printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name); 2932 printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name);
2933 new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm; 2933 new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm;
2934 } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) { 2934 } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) {
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 1428bb7715af..47e407e8e9f1 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -48,7 +48,7 @@
48 */ 48 */
49 49
50#define DRV_NAME "8139cp" 50#define DRV_NAME "8139cp"
51#define DRV_VERSION "1.2" 51#define DRV_VERSION "1.3"
52#define DRV_RELDATE "Mar 22, 2004" 52#define DRV_RELDATE "Mar 22, 2004"
53 53
54 54
@@ -942,8 +942,6 @@ static void __cp_set_rx_mode (struct net_device *dev)
942 /* Note: do not reorder, GCC is clever about common statements. */ 942 /* Note: do not reorder, GCC is clever about common statements. */
943 if (dev->flags & IFF_PROMISC) { 943 if (dev->flags & IFF_PROMISC) {
944 /* Unconditionally log net taps. */ 944 /* Unconditionally log net taps. */
945 printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
946 dev->name);
947 rx_mode = 945 rx_mode =
948 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 946 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
949 AcceptAllPhys; 947 AcceptAllPhys;
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index e4f4eaff7679..0fba8a6331a7 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -90,7 +90,7 @@
90*/ 90*/
91 91
92#define DRV_NAME "8139too" 92#define DRV_NAME "8139too"
93#define DRV_VERSION "0.9.27" 93#define DRV_VERSION "0.9.28"
94 94
95 95
96#include <linux/module.h> 96#include <linux/module.h>
@@ -2512,9 +2512,6 @@ static void __set_rx_mode (struct net_device *dev)
2512 2512
2513 /* Note: do not reorder, GCC is clever about common statements. */ 2513 /* Note: do not reorder, GCC is clever about common statements. */
2514 if (dev->flags & IFF_PROMISC) { 2514 if (dev->flags & IFF_PROMISC) {
2515 /* Unconditionally log net taps. */
2516 printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
2517 dev->name);
2518 rx_mode = 2515 rx_mode =
2519 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 2516 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
2520 AcceptAllPhys; 2517 AcceptAllPhys;
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index ed322a76980d..bffde2288630 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -101,9 +101,9 @@ Revision History:
101 101
102#include "amd8111e.h" 102#include "amd8111e.h"
103#define MODULE_NAME "amd8111e" 103#define MODULE_NAME "amd8111e"
104#define MODULE_VERS "3.0.5" 104#define MODULE_VERS "3.0.6"
105MODULE_AUTHOR("Advanced Micro Devices, Inc."); 105MODULE_AUTHOR("Advanced Micro Devices, Inc.");
106MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.3"); 106MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version 3.0.6");
107MODULE_LICENSE("GPL"); 107MODULE_LICENSE("GPL");
108MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); 108MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);
109module_param_array(speed_duplex, int, NULL, 0); 109module_param_array(speed_duplex, int, NULL, 0);
@@ -1527,7 +1527,6 @@ static void amd8111e_set_multicast_list(struct net_device *dev)
1527 u32 mc_filter[2] ; 1527 u32 mc_filter[2] ;
1528 int i,bit_num; 1528 int i,bit_num;
1529 if(dev->flags & IFF_PROMISC){ 1529 if(dev->flags & IFF_PROMISC){
1530 printk(KERN_INFO "%s: Setting promiscuous mode.\n",dev->name);
1531 writel( VAL2 | PROM, lp->mmio + CMD2); 1530 writel( VAL2 | PROM, lp->mmio + CMD2);
1532 return; 1531 return;
1533 } 1532 }
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index cc721addd576..3aef3c10d56f 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -825,8 +825,6 @@ static void set_multicast_list(struct net_device *dev)
825 ariadne_init_ring(dev); 825 ariadne_init_ring(dev);
826 826
827 if (dev->flags & IFF_PROMISC) { 827 if (dev->flags & IFF_PROMISC) {
828 /* Log any net taps. */
829 printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
830 lance->RAP = CSR15; /* Mode Register */ 828 lance->RAP = CSR15; /* Mode Register */
831 lance->RDP = PROM; /* Set promiscuous mode */ 829 lance->RDP = PROM; /* Set promiscuous mode */
832 } else { 830 } else {
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 4ca061c2d5b2..1a85451dcb41 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -58,7 +58,7 @@
58#include <asm/dma.h> 58#include <asm/dma.h>
59 59
60static char version[] __initdata = 60static char version[] __initdata =
61 "at1700.c:v1.15 4/7/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; 61 "at1700.c:v1.16 9/11/06 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
62 62
63#define DRV_NAME "at1700" 63#define DRV_NAME "at1700"
64 64
@@ -851,8 +851,6 @@ set_rx_mode(struct net_device *dev)
851 int i; 851 int i;
852 852
853 if (dev->flags & IFF_PROMISC) { 853 if (dev->flags & IFF_PROMISC) {
854 /* Unconditionally log net taps. */
855 printk("%s: Promiscuous mode enabled.\n", dev->name);
856 memset(mc_filter, 0xff, sizeof(mc_filter)); 854 memset(mc_filter, 0xff, sizeof(mc_filter));
857 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */ 855 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */
858 } else if (dev->mc_count > MC_FILTERBREAK 856 } else if (dev->mc_count > MC_FILTERBREAK
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 91783a8008be..465efe7a6c56 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -1121,7 +1121,7 @@ static void set_multicast_list( struct net_device *dev )
1121 1121
1122 if (dev->flags & IFF_PROMISC) { 1122 if (dev->flags & IFF_PROMISC) {
1123 /* Log any net taps. */ 1123 /* Log any net taps. */
1124 DPRINTK( 1, ( "%s: Promiscuous mode enabled.\n", dev->name )); 1124 DPRINTK( 2, ( "%s: Promiscuous mode enabled.\n", dev->name ));
1125 REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ 1125 REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */
1126 } else { 1126 } else {
1127 short multicast_table[4]; 1127 short multicast_table[4];
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 55f6e3f65b53..85be0e6aa1f3 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -72,7 +72,7 @@ static int au1000_debug = 3;
72#endif 72#endif
73 73
74#define DRV_NAME "au1000_eth" 74#define DRV_NAME "au1000_eth"
75#define DRV_VERSION "1.5" 75#define DRV_VERSION "1.6"
76#define DRV_AUTHOR "Pete Popov <ppopov@embeddedalley.com>" 76#define DRV_AUTHOR "Pete Popov <ppopov@embeddedalley.com>"
77#define DRV_DESC "Au1xxx on-chip Ethernet driver" 77#define DRV_DESC "Au1xxx on-chip Ethernet driver"
78 78
@@ -1292,7 +1292,6 @@ static void set_rx_mode(struct net_device *dev)
1292 1292
1293 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1293 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1294 aup->mac->control |= MAC_PROMISCUOUS; 1294 aup->mac->control |= MAC_PROMISCUOUS;
1295 printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
1296 } else if ((dev->flags & IFF_ALLMULTI) || 1295 } else if ((dev->flags & IFF_ALLMULTI) ||
1297 dev->mc_count > MULTICAST_FILTER_LIMIT) { 1296 dev->mc_count > MULTICAST_FILTER_LIMIT) {
1298 aup->mac->control |= MAC_PASS_ALL_MULTI; 1297 aup->mac->control |= MAC_PASS_ALL_MULTI;
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 8dc61d65dd23..bf9efa75390f 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -154,7 +154,7 @@ static const char version[] =
154#include <asm/dma.h> 154#include <asm/dma.h>
155 155
156#define DRV_NAME "eepro" 156#define DRV_NAME "eepro"
157#define DRV_VERSION "0.13b" 157#define DRV_VERSION "0.13c"
158 158
159#define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) ) 159#define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) )
160/* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */ 160/* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */
@@ -1333,7 +1333,6 @@ set_multicast_list(struct net_device *dev)
1333 mode = inb(ioaddr + REG3); 1333 mode = inb(ioaddr + REG3);
1334 outb(mode, ioaddr + REG3); /* writing reg. 3 to complete the update */ 1334 outb(mode, ioaddr + REG3); /* writing reg. 3 to complete the update */
1335 eepro_sw2bank0(ioaddr); /* Return to BANK 0 now */ 1335 eepro_sw2bank0(ioaddr); /* Return to BANK 0 now */
1336 printk(KERN_INFO "%s: promiscuous mode enabled.\n", dev->name);
1337 } 1336 }
1338 1337
1339 else if (dev->mc_count==0 ) 1338 else if (dev->mc_count==0 )
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index a67650ccf084..8f37c98dcb7c 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -26,8 +26,8 @@
26*/ 26*/
27 27
28#define DRV_NAME "epic100" 28#define DRV_NAME "epic100"
29#define DRV_VERSION "2.0" 29#define DRV_VERSION "2.1"
30#define DRV_RELDATE "June 27, 2006" 30#define DRV_RELDATE "Sept 11, 2006"
31 31
32/* The user-configurable values. 32/* The user-configurable values.
33 These may be modified when a driver module is loaded.*/ 33 These may be modified when a driver module is loaded.*/
@@ -1386,7 +1386,6 @@ static void set_rx_mode(struct net_device *dev)
1386 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1386 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1387 outl(0x002C, ioaddr + RxCtrl); 1387 outl(0x002C, ioaddr + RxCtrl);
1388 /* Unconditionally log net taps. */ 1388 /* Unconditionally log net taps. */
1389 printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
1390 memset(mc_filter, 0xff, sizeof(mc_filter)); 1389 memset(mc_filter, 0xff, sizeof(mc_filter));
1391 } else if ((dev->mc_count > 0) || (dev->flags & IFF_ALLMULTI)) { 1390 } else if ((dev->mc_count > 0) || (dev->flags & IFF_ALLMULTI)) {
1392 /* There is apparently a chip bug, so the multicast filter 1391 /* There is apparently a chip bug, so the multicast filter
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 567e27413cfd..fac0a4519184 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -25,8 +25,8 @@
25*/ 25*/
26 26
27#define DRV_NAME "fealnx" 27#define DRV_NAME "fealnx"
28#define DRV_VERSION "2.51" 28#define DRV_VERSION "2.52"
29#define DRV_RELDATE "Nov-17-2001" 29#define DRV_RELDATE "Sep-11-2006"
30 30
31static int debug; /* 1-> print debug message */ 31static int debug; /* 1-> print debug message */
32static int max_interrupt_work = 20; 32static int max_interrupt_work = 20;
@@ -1800,8 +1800,6 @@ static void __set_rx_mode(struct net_device *dev)
1800 u32 rx_mode; 1800 u32 rx_mode;
1801 1801
1802 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1802 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1803 /* Unconditionally log net taps. */
1804 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
1805 memset(mc_filter, 0xff, sizeof(mc_filter)); 1803 memset(mc_filter, 0xff, sizeof(mc_filter));
1806 rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM; 1804 rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM;
1807 } else if ((dev->mc_count > multicast_filter_limit) 1805 } else if ((dev->mc_count > multicast_filter_limit)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 9b4030031744..9eedb27dd695 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -2227,8 +2227,6 @@ static void set_multicast_list(struct net_device *dev)
2227 ep = fep->hwp; 2227 ep = fep->hwp;
2228 2228
2229 if (dev->flags&IFF_PROMISC) { 2229 if (dev->flags&IFF_PROMISC) {
2230 /* Log any net taps. */
2231 printk("%s: Promiscuous mode enabled.\n", dev->name);
2232 ep->fec_r_cntrl |= 0x0008; 2230 ep->fec_r_cntrl |= 0x0008;
2233 } else { 2231 } else {
2234 2232
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index ebbbd6ca6204..5130da094305 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1708,9 +1708,6 @@ static void gfar_set_multi(struct net_device *dev)
1708 u32 tempval; 1708 u32 tempval;
1709 1709
1710 if(dev->flags & IFF_PROMISC) { 1710 if(dev->flags & IFF_PROMISC) {
1711 if (netif_msg_drv(priv))
1712 printk(KERN_INFO "%s: Entering promiscuous mode.\n",
1713 dev->name);
1714 /* Set RCTRL to PROM */ 1711 /* Set RCTRL to PROM */
1715 tempval = gfar_read(&regs->rctrl); 1712 tempval = gfar_read(&regs->rctrl);
1716 tempval |= RCTRL_PROM; 1713 tempval |= RCTRL_PROM;
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 409c6aab0411..9927bff75d6f 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -27,8 +27,8 @@
27*/ 27*/
28 28
29#define DRV_NAME "hamachi" 29#define DRV_NAME "hamachi"
30#define DRV_VERSION "2.0" 30#define DRV_VERSION "2.1"
31#define DRV_RELDATE "June 27, 2006" 31#define DRV_RELDATE "Sept 11, 2006"
32 32
33 33
34/* A few user-configurable values. */ 34/* A few user-configurable values. */
@@ -1851,8 +1851,6 @@ static void set_rx_mode(struct net_device *dev)
1851 void __iomem *ioaddr = hmp->base; 1851 void __iomem *ioaddr = hmp->base;
1852 1852
1853 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1853 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1854 /* Unconditionally log net taps. */
1855 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
1856 writew(0x000F, ioaddr + AddrMode); 1854 writew(0x000F, ioaddr + AddrMode);
1857 } else if ((dev->mc_count > 63) || (dev->flags & IFF_ALLMULTI)) { 1855 } else if ((dev->mc_count > 63) || (dev->flags & IFF_ALLMULTI)) {
1858 /* Too many to match, or accept all multicasts. */ 1856 /* Too many to match, or accept all multicasts. */
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();
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 5b4dbfe5fb77..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
45static const char version[] = "lance.c:v1.15ac 1999/11/13 dplatt@3do.com, becker@cesdis.gsfc.nasa.gov\n"; 45static 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>
@@ -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 {
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index db0475a1102f..6c35bb628062 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -54,8 +54,8 @@
54#include <asm/uaccess.h> 54#include <asm/uaccess.h>
55 55
56#define DRV_NAME "natsemi" 56#define DRV_NAME "natsemi"
57#define DRV_VERSION "2.0" 57#define DRV_VERSION "2.1"
58#define DRV_RELDATE "June 27, 2006" 58#define DRV_RELDATE "Sept 11, 2006"
59 59
60#define RX_OFFSET 2 60#define RX_OFFSET 2
61 61
@@ -2387,9 +2387,6 @@ static void __set_rx_mode(struct net_device *dev)
2387 u32 rx_mode; 2387 u32 rx_mode;
2388 2388
2389 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 2389 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
2390 /* Unconditionally log net taps. */
2391 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
2392 dev->name);
2393 rx_mode = RxFilterEnable | AcceptBroadcast 2390 rx_mode = RxFilterEnable | AcceptBroadcast
2394 | AcceptAllMulticast | AcceptAllPhys | AcceptMyPhys; 2391 | AcceptAllMulticast | AcceptAllPhys | AcceptMyPhys;
2395 } else if ((dev->mc_count > multicast_filter_limit) 2392 } else if ((dev->mc_count > multicast_filter_limit)
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index e0e293964042..666cd3bbd129 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -98,7 +98,7 @@ IVc. Errata
98#include <linux/crc32.h> 98#include <linux/crc32.h>
99#include <asm/io.h> 99#include <asm/io.h>
100 100
101#define NETDRV_VERSION "1.0.0" 101#define NETDRV_VERSION "1.0.1"
102#define MODNAME "netdrv" 102#define MODNAME "netdrv"
103#define NETDRV_DRIVER_LOAD_MSG "MyVendor Fast Ethernet driver " NETDRV_VERSION " loaded" 103#define NETDRV_DRIVER_LOAD_MSG "MyVendor Fast Ethernet driver " NETDRV_VERSION " loaded"
104#define PFX MODNAME ": " 104#define PFX MODNAME ": "
@@ -1853,9 +1853,6 @@ static void netdrv_set_rx_mode (struct net_device *dev)
1853 1853
1854 /* Note: do not reorder, GCC is clever about common statements. */ 1854 /* Note: do not reorder, GCC is clever about common statements. */
1855 if (dev->flags & IFF_PROMISC) { 1855 if (dev->flags & IFF_PROMISC) {
1856 /* Unconditionally log net taps. */
1857 printk (KERN_NOTICE "%s: Promiscuous mode enabled.\n",
1858 dev->name);
1859 rx_mode = 1856 rx_mode =
1860 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 1857 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
1861 AcceptAllPhys; 1858 AcceptAllPhys;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index ea93b8f18605..74211af0e0c9 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -29,7 +29,7 @@
29======================================================================*/ 29======================================================================*/
30 30
31#define DRV_NAME "fmvj18x_cs" 31#define DRV_NAME "fmvj18x_cs"
32#define DRV_VERSION "2.8" 32#define DRV_VERSION "2.9"
33 33
34#include <linux/module.h> 34#include <linux/module.h>
35#include <linux/kernel.h> 35#include <linux/kernel.h>
@@ -1193,8 +1193,6 @@ static void set_rx_mode(struct net_device *dev)
1193 outb(CONFIG0_RST_1, ioaddr + CONFIG_0); 1193 outb(CONFIG0_RST_1, ioaddr + CONFIG_0);
1194 1194
1195 if (dev->flags & IFF_PROMISC) { 1195 if (dev->flags & IFF_PROMISC) {
1196 /* Unconditionally log net taps. */
1197 printk("%s: Promiscuous mode enabled.\n", dev->name);
1198 memset(mc_filter, 0xff, sizeof(mc_filter)); 1196 memset(mc_filter, 0xff, sizeof(mc_filter));
1199 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */ 1197 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */
1200 } else if (dev->mc_count > MC_FILTERBREAK 1198 } else if (dev->mc_count > MC_FILTERBREAK
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index a73d54553030..3fb369f2e7ed 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -80,14 +80,14 @@ INT_MODULE_PARM(if_port, 0);
80#ifdef PCMCIA_DEBUG 80#ifdef PCMCIA_DEBUG
81INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); 81INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
82static const char *version = 82static const char *version =
83"smc91c92_cs.c 0.09 1996/8/4 Donald Becker, becker@scyld.com.\n"; 83"smc91c92_cs.c 1.123 2006/11/09 Donald Becker, becker@scyld.com.\n";
84#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 84#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
85#else 85#else
86#define DEBUG(n, args...) 86#define DEBUG(n, args...)
87#endif 87#endif
88 88
89#define DRV_NAME "smc91c92_cs" 89#define DRV_NAME "smc91c92_cs"
90#define DRV_VERSION "1.122" 90#define DRV_VERSION "1.123"
91 91
92/*====================================================================*/ 92/*====================================================================*/
93 93
@@ -1780,7 +1780,6 @@ static void set_rx_mode(struct net_device *dev)
1780 u_short rx_cfg_setting; 1780 u_short rx_cfg_setting;
1781 1781
1782 if (dev->flags & IFF_PROMISC) { 1782 if (dev->flags & IFF_PROMISC) {
1783 printk(KERN_NOTICE "%s: setting Rx mode to promiscuous.\n", dev->name);
1784 rx_cfg_setting = RxStripCRC | RxEnable | RxPromisc | RxAllMulti; 1783 rx_cfg_setting = RxStripCRC | RxEnable | RxPromisc | RxAllMulti;
1785 } else if (dev->flags & IFF_ALLMULTI) 1784 } else if (dev->flags & IFF_ALLMULTI)
1786 rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti; 1785 rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 9ab1618e82a4..e4c8896b76cb 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2708,7 +2708,6 @@ static struct net_device_stats *sbmac_get_stats(struct net_device *dev)
2708static void sbmac_set_rx_mode(struct net_device *dev) 2708static void sbmac_set_rx_mode(struct net_device *dev)
2709{ 2709{
2710 unsigned long flags; 2710 unsigned long flags;
2711 int msg_flag = 0;
2712 struct sbmac_softc *sc = netdev_priv(dev); 2711 struct sbmac_softc *sc = netdev_priv(dev);
2713 2712
2714 spin_lock_irqsave(&sc->sbm_lock, flags); 2713 spin_lock_irqsave(&sc->sbm_lock, flags);
@@ -2718,22 +2717,14 @@ static void sbmac_set_rx_mode(struct net_device *dev)
2718 */ 2717 */
2719 2718
2720 if (dev->flags & IFF_PROMISC) { 2719 if (dev->flags & IFF_PROMISC) {
2721 /* Unconditionally log net taps. */
2722 msg_flag = 1;
2723 sbmac_promiscuous_mode(sc,1); 2720 sbmac_promiscuous_mode(sc,1);
2724 } 2721 }
2725 else { 2722 else {
2726 msg_flag = 2;
2727 sbmac_promiscuous_mode(sc,0); 2723 sbmac_promiscuous_mode(sc,0);
2728 } 2724 }
2729 } 2725 }
2730 spin_unlock_irqrestore(&sc->sbm_lock, flags); 2726 spin_unlock_irqrestore(&sc->sbm_lock, flags);
2731 2727
2732 if (msg_flag) {
2733 printk(KERN_NOTICE "%s: Promiscuous mode %sabled.\n",
2734 dev->name,(msg_flag==1)?"en":"dis");
2735 }
2736
2737 /* 2728 /*
2738 * Program the multicasts. Do this every time. 2729 * Program the multicasts. Do this every time.
2739 */ 2730 */
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index df0cbebb3277..9a779e2cab0e 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -821,9 +821,6 @@ static void sis190_set_rx_mode(struct net_device *dev)
821 u16 rx_mode; 821 u16 rx_mode;
822 822
823 if (dev->flags & IFF_PROMISC) { 823 if (dev->flags & IFF_PROMISC) {
824 /* Unconditionally log net taps. */
825 net_drv(tp, KERN_NOTICE "%s: Promiscuous mode enabled.\n",
826 dev->name);
827 rx_mode = 824 rx_mode =
828 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 825 AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
829 AcceptAllPhys; 826 AcceptAllPhys;
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 2dcadb169a22..0d76e2214762 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -914,7 +914,7 @@ static void set_multicast_list( struct net_device *dev )
914 914
915 if (dev->flags & IFF_PROMISC) { 915 if (dev->flags & IFF_PROMISC) {
916 /* Log any net taps. */ 916 /* Log any net taps. */
917 DPRINTK( 1, ( "%s: Promiscuous mode enabled.\n", dev->name )); 917 DPRINTK( 3, ( "%s: Promiscuous mode enabled.\n", dev->name ));
918 REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */ 918 REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */
919 } else { 919 } else {
920 short multicast_table[4]; 920 short multicast_table[4];
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 698568e751da..c85ff2630b10 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -21,8 +21,8 @@
21*/ 21*/
22 22
23#define DRV_NAME "sundance" 23#define DRV_NAME "sundance"
24#define DRV_VERSION "1.1" 24#define DRV_VERSION "1.2"
25#define DRV_RELDATE "27-Jun-2006" 25#define DRV_RELDATE "11-Sep-2006"
26 26
27 27
28/* The user-configurable values. 28/* The user-configurable values.
@@ -1467,8 +1467,6 @@ static void set_rx_mode(struct net_device *dev)
1467 int i; 1467 int i;
1468 1468
1469 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1469 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1470 /* Unconditionally log net taps. */
1471 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
1472 memset(mc_filter, 0xff, sizeof(mc_filter)); 1470 memset(mc_filter, 0xff, sizeof(mc_filter));
1473 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys; 1471 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys;
1474 } else if ((dev->mc_count > multicast_filter_limit) 1472 } else if ((dev->mc_count > multicast_filter_limit)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7351831f57ce..29ee58fc84eb 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -17,9 +17,9 @@
17 17
18#define DRV_NAME "tulip" 18#define DRV_NAME "tulip"
19#ifdef CONFIG_TULIP_NAPI 19#ifdef CONFIG_TULIP_NAPI
20#define DRV_VERSION "1.1.13-NAPI" /* Keep at least for test */ 20#define DRV_VERSION "1.1.14-NAPI" /* Keep at least for test */
21#else 21#else
22#define DRV_VERSION "1.1.13" 22#define DRV_VERSION "1.1.14"
23#endif 23#endif
24#define DRV_RELDATE "May 11, 2002" 24#define DRV_RELDATE "May 11, 2002"
25 25
@@ -1023,8 +1023,6 @@ static void set_rx_mode(struct net_device *dev)
1023 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1023 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1024 tp->csr6 |= AcceptAllMulticast | AcceptAllPhys; 1024 tp->csr6 |= AcceptAllMulticast | AcceptAllPhys;
1025 csr6 |= AcceptAllMulticast | AcceptAllPhys; 1025 csr6 |= AcceptAllMulticast | AcceptAllPhys;
1026 /* Unconditionally log net taps. */
1027 printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
1028 } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { 1026 } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) {
1029 /* Too many to filter well -- accept all multicasts. */ 1027 /* Too many to filter well -- accept all multicasts. */
1030 tp->csr6 |= AcceptAllMulticast; 1028 tp->csr6 |= AcceptAllMulticast;
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index eba9083da146..8e7d6f010400 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -45,8 +45,8 @@
45*/ 45*/
46 46
47#define DRV_NAME "winbond-840" 47#define DRV_NAME "winbond-840"
48#define DRV_VERSION "1.01-d" 48#define DRV_VERSION "1.01-e"
49#define DRV_RELDATE "Nov-17-2001" 49#define DRV_RELDATE "Sep-11-2006"
50 50
51 51
52/* Automatically extracted configuration info: 52/* Automatically extracted configuration info:
@@ -1378,8 +1378,6 @@ static u32 __set_rx_mode(struct net_device *dev)
1378 u32 rx_mode; 1378 u32 rx_mode;
1379 1379
1380 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1380 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1381 /* Unconditionally log net taps. */
1382 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
1383 memset(mc_filter, 0xff, sizeof(mc_filter)); 1381 memset(mc_filter, 0xff, sizeof(mc_filter));
1384 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys 1382 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys
1385 | AcceptMyPhys; 1383 | AcceptMyPhys;
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 4103c37172f9..045c4fc2489a 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -100,8 +100,8 @@ static const int multicast_filter_limit = 32;
100#define PKT_BUF_SZ 1536 100#define PKT_BUF_SZ 1536
101 101
102#define DRV_MODULE_NAME "typhoon" 102#define DRV_MODULE_NAME "typhoon"
103#define DRV_MODULE_VERSION "1.5.7" 103#define DRV_MODULE_VERSION "1.5.8"
104#define DRV_MODULE_RELDATE "05/01/07" 104#define DRV_MODULE_RELDATE "06/11/09"
105#define PFX DRV_MODULE_NAME ": " 105#define PFX DRV_MODULE_NAME ": "
106#define ERR_PFX KERN_ERR PFX 106#define ERR_PFX KERN_ERR PFX
107 107
@@ -937,8 +937,6 @@ typhoon_set_rx_mode(struct net_device *dev)
937 937
938 filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST; 938 filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST;
939 if(dev->flags & IFF_PROMISC) { 939 if(dev->flags & IFF_PROMISC) {
940 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
941 dev->name);
942 filter |= TYPHOON_RX_FILTER_PROMISCOUS; 940 filter |= TYPHOON_RX_FILTER_PROMISCOUS;
943 } else if((dev->mc_count > multicast_filter_limit) || 941 } else if((dev->mc_count > multicast_filter_limit) ||
944 (dev->flags & IFF_ALLMULTI)) { 942 (dev->flags & IFF_ALLMULTI)) {
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 47f49ef72bdc..4e188f4289b4 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -47,7 +47,7 @@
47 47
48#undef DEBUG 48#undef DEBUG
49 49
50#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:June 20, 2006" 50#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:Sept 11, 2006"
51#define DRV_NAME "ucc_geth" 51#define DRV_NAME "ucc_geth"
52 52
53#define ugeth_printk(level, format, arg...) \ 53#define ugeth_printk(level, format, arg...) \
@@ -2510,8 +2510,6 @@ static void ucc_geth_set_multi(struct net_device *dev)
2510 2510
2511 if (dev->flags & IFF_PROMISC) { 2511 if (dev->flags & IFF_PROMISC) {
2512 2512
2513 /* Log any net taps. */
2514 printk("%s: Promiscuous mode enabled.\n", dev->name);
2515 uf_regs->upsmr |= UPSMR_PRO; 2513 uf_regs->upsmr |= UPSMR_PRO;
2516 2514
2517 } else { 2515 } else {
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index ae971080e2e4..9390451bad2c 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);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index aa9cd92f46b2..35940ac0ff02 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);
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index 496c3d597444..a33a1adb11f2 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -29,7 +29,7 @@
29 29
30#define VELOCITY_NAME "via-velocity" 30#define VELOCITY_NAME "via-velocity"
31#define VELOCITY_FULL_DRV_NAM "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver" 31#define VELOCITY_FULL_DRV_NAM "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"
32#define VELOCITY_VERSION "1.13" 32#define VELOCITY_VERSION "1.14"
33 33
34#define VELOCITY_IO_SIZE 256 34#define VELOCITY_IO_SIZE 256
35 35
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 8459a18254a4..cdc98ffcdab6 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -24,8 +24,8 @@
24*/ 24*/
25 25
26#define DRV_NAME "yellowfin" 26#define DRV_NAME "yellowfin"
27#define DRV_VERSION "2.0" 27#define DRV_VERSION "2.1"
28#define DRV_RELDATE "Jun 27, 2006" 28#define DRV_RELDATE "Sep 11, 2006"
29 29
30#define PFX DRV_NAME ": " 30#define PFX DRV_NAME ": "
31 31
@@ -1307,8 +1307,6 @@ static void set_rx_mode(struct net_device *dev)
1307 /* Stop the Rx process to change any value. */ 1307 /* Stop the Rx process to change any value. */
1308 iowrite16(cfg_value & ~0x1000, ioaddr + Cnfg); 1308 iowrite16(cfg_value & ~0x1000, ioaddr + Cnfg);
1309 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1309 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1310 /* Unconditionally log net taps. */
1311 printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
1312 iowrite16(0x000F, ioaddr + AddrMode); 1310 iowrite16(0x000F, ioaddr + AddrMode);
1313 } else if ((dev->mc_count > 64) || (dev->flags & IFF_ALLMULTI)) { 1311 } else if ((dev->mc_count > 64) || (dev->flags & IFF_ALLMULTI)) {
1314 /* Too many to filter well, or accept all multicasts. */ 1312 /* Too many to filter well, or accept all multicasts. */