diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 17:45:33 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 17:45:33 +0200 |
| commit | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (patch) | |
| tree | eb3f28516c05a945f2e9c8003e5864de4e0763bc /drivers/net/typhoon.c | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff) | |
| parent | [PATCH] Remove more unnecessary driver printk's (diff) | |
| download | linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.tar.xz linux-4e83b7fad8d3fd55828baa4510885c7362e66a26.zip | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 1014461178cc..1084180205a3 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -100,8 +100,8 @@ static const int multicast_filter_limit = 32; #define PKT_BUF_SZ 1536 #define DRV_MODULE_NAME "typhoon" -#define DRV_MODULE_VERSION "1.5.7" -#define DRV_MODULE_RELDATE "05/01/07" +#define DRV_MODULE_VERSION "1.5.8" +#define DRV_MODULE_RELDATE "06/11/09" #define PFX DRV_MODULE_NAME ": " #define ERR_PFX KERN_ERR PFX @@ -937,8 +937,6 @@ typhoon_set_rx_mode(struct net_device *dev) filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST; if(dev->flags & IFF_PROMISC) { - printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", - dev->name); filter |= TYPHOON_RX_FILTER_PROMISCOUS; } else if((dev->mc_count > multicast_filter_limit) || (dev->flags & IFF_ALLMULTI)) { |