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/3c59x.c | |
| parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
| parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) | |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 7c23813bb097..415d08113e10 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -2928,7 +2928,7 @@ static void set_rx_mode(struct net_device *dev) | |||
| 2928 | int new_mode; | 2928 | int new_mode; |
| 2929 | 2929 | ||
| 2930 | if (dev->flags & IFF_PROMISC) { | 2930 | if (dev->flags & IFF_PROMISC) { |
| 2931 | if (vortex_debug > 0) | 2931 | if (vortex_debug > 3) |
| 2932 | printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name); | 2932 | printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name); |
| 2933 | new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm; | 2933 | new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm; |
| 2934 | } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) { | 2934 | } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) { |