aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fealnx.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/fealnx.c
parentc925f1ea9ec20a95d46f57810f4a4d69db74580e (diff)
parentd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff)
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r--drivers/net/fealnx.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index a2121faa610f..56f81a2bec5b 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)