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/tulip/tulip_core.c | |
parent | c925f1ea9ec20a95d46f57810f4a4d69db74580e (diff) | |
parent | d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (diff) |
Merge branch 'tmp' into upstream
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 8092c4f8c036..2034baf5a2bb 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -17,9 +17,9 @@ | |||
17 | 17 | ||
18 | #define DRV_NAME "tulip" | 18 | #define DRV_NAME "tulip" |
19 | #ifdef CONFIG_TULIP_NAPI | 19 | #ifdef CONFIG_TULIP_NAPI |
20 | #define DRV_VERSION "1.1.13-NAPI" /* Keep at least for test */ | 20 | #define DRV_VERSION "1.1.14-NAPI" /* Keep at least for test */ |
21 | #else | 21 | #else |
22 | #define DRV_VERSION "1.1.13" | 22 | #define DRV_VERSION "1.1.14" |
23 | #endif | 23 | #endif |
24 | #define DRV_RELDATE "May 11, 2002" | 24 | #define DRV_RELDATE "May 11, 2002" |
25 | 25 | ||
@@ -1019,8 +1019,6 @@ static void set_rx_mode(struct net_device *dev) | |||
1019 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1019 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1020 | tp->csr6 |= AcceptAllMulticast | AcceptAllPhys; | 1020 | tp->csr6 |= AcceptAllMulticast | AcceptAllPhys; |
1021 | csr6 |= AcceptAllMulticast | AcceptAllPhys; | 1021 | csr6 |= AcceptAllMulticast | AcceptAllPhys; |
1022 | /* Unconditionally log net taps. */ | ||
1023 | printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name); | ||
1024 | } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { | 1022 | } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { |
1025 | /* Too many to filter well -- accept all multicasts. */ | 1023 | /* Too many to filter well -- accept all multicasts. */ |
1026 | tp->csr6 |= AcceptAllMulticast; | 1024 | tp->csr6 |= AcceptAllMulticast; |