diff options
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 6 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 7351831f57ce..29ee58fc84eb 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 | ||
@@ -1023,8 +1023,6 @@ static void set_rx_mode(struct net_device *dev) | |||
1023 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1023 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1024 | tp->csr6 |= AcceptAllMulticast | AcceptAllPhys; | 1024 | tp->csr6 |= AcceptAllMulticast | AcceptAllPhys; |
1025 | csr6 |= AcceptAllMulticast | AcceptAllPhys; | 1025 | csr6 |= AcceptAllMulticast | AcceptAllPhys; |
1026 | /* Unconditionally log net taps. */ | ||
1027 | printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name); | ||
1028 | } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { | 1026 | } else if ((dev->mc_count > 1000) || (dev->flags & IFF_ALLMULTI)) { |
1029 | /* Too many to filter well -- accept all multicasts. */ | 1027 | /* Too many to filter well -- accept all multicasts. */ |
1030 | tp->csr6 |= AcceptAllMulticast; | 1028 | tp->csr6 |= AcceptAllMulticast; |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index eba9083da146..8e7d6f010400 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -45,8 +45,8 @@ | |||
45 | */ | 45 | */ |
46 | 46 | ||
47 | #define DRV_NAME "winbond-840" | 47 | #define DRV_NAME "winbond-840" |
48 | #define DRV_VERSION "1.01-d" | 48 | #define DRV_VERSION "1.01-e" |
49 | #define DRV_RELDATE "Nov-17-2001" | 49 | #define DRV_RELDATE "Sep-11-2006" |
50 | 50 | ||
51 | 51 | ||
52 | /* Automatically extracted configuration info: | 52 | /* Automatically extracted configuration info: |
@@ -1378,8 +1378,6 @@ static u32 __set_rx_mode(struct net_device *dev) | |||
1378 | u32 rx_mode; | 1378 | u32 rx_mode; |
1379 | 1379 | ||
1380 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1380 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1381 | /* Unconditionally log net taps. */ | ||
1382 | printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name); | ||
1383 | memset(mc_filter, 0xff, sizeof(mc_filter)); | 1381 | memset(mc_filter, 0xff, sizeof(mc_filter)); |
1384 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys | 1382 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys |
1385 | | AcceptMyPhys; | 1383 | | AcceptMyPhys; |