diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:45:33 -0400 |
| commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
| tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/sundance.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
| download | linux-3.10-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.gz linux-3.10-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.bz2 linux-3.10-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/sundance.c')
| -rw-r--r-- | drivers/net/sundance.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index c243a80f400..a3a7a3506bd 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c @@ -23,8 +23,8 @@ */ #define DRV_NAME "sundance" -#define DRV_VERSION "1.1" -#define DRV_RELDATE "27-Jun-2006" +#define DRV_VERSION "1.2" +#define DRV_RELDATE "11-Sep-2006" /* The user-configurable values. @@ -1464,8 +1464,6 @@ static void set_rx_mode(struct net_device *dev) int i; 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 = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys; } else if ((dev->mc_count > multicast_filter_limit) |