diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /Documentation/networking | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/tlan.txt | 4 | ||||
| -rw-r--r-- | Documentation/networking/tulip.txt | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/Documentation/networking/tlan.txt b/Documentation/networking/tlan.txt index 4e1347395..1485930fb 100644 --- a/Documentation/networking/tlan.txt +++ b/Documentation/networking/tlan.txt @@ -1,8 +1,8 @@ (C) 1997-1998 Caldera, Inc. (C) 1998 James Banks -(C) 1999-2000 Torben Mathiasen <torben.mathiasen@compaq.com> +(C) 1999-2000 Torben Mathiasen <tmm@image.dk, torben.mathiasen@compaq.com> -TLAN driver for Linux, version 1.3 +TLAN driver for Linux, version 1.5 README diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt index ecef178b0..f4b553705 100644 --- a/Documentation/networking/tulip.txt +++ b/Documentation/networking/tulip.txt @@ -125,7 +125,7 @@ them. The MII transceiver status is polled using an kernel timer. Source tree tour ----------------- +================ The following is a list of files comprising the Tulip ethernet driver in drivers/net/tulip subdirectory. @@ -140,5 +140,24 @@ tulip_core.c - Driver core (a.k.a. where "everything else" goes) +Version history +=============== +0.9.4.2 (March 21, 2000): +* Fix 21041 CSR7, CSR13/14/15 handling +* Merge some PCI ids from tulip 0.91x +* Merge some HAS_xxx flags and flag settings from tulip 0.91x +* asm/io.h fix (submitted by many) and cleanup +* s/HAS_NWAY143/HAS_NWAY/ +* Cleanup 21041 mode reporting +* Small code cleanups + +0.9.4.1 (March 18, 2000): +* Finish PCI DMA conversion (davem) +* Do not netif_start_queue() at end of tulip_tx_timeout() (kuznet) +* PCI DMA fix (kuznet) +* eeprom.c code cleanup +* Remove Xircom Tulip crud + + [EOF] |