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)
downloadkernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip
kernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.gz
kernel_samsung_smdk4412-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.bz2
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 a2121fa..56f81a2 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -25,8 +25,8 @@
*/
#define DRV_NAME "fealnx"
-#define DRV_VERSION "2.51"
-#define DRV_RELDATE "Nov-17-2001"
+#define DRV_VERSION "2.52"
+#define DRV_RELDATE "Sep-11-2006"
static int debug; /* 1-> print debug message */
static int max_interrupt_work = 20;
@@ -1800,8 +1800,6 @@ static void __set_rx_mode(struct net_device *dev)
u32 rx_mode;
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
- /* Unconditionally log net taps. */
- printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
memset(mc_filter, 0xff, sizeof(mc_filter));
rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM;
} else if ((dev->mc_count > multicast_filter_limit)