diff options
Diffstat (limited to 'drivers/net/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 6 |
1 files changed, 2 insertions, 4 deletions
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. */ |