o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

25 files changed, 532 insertions, 162 deletions

diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index aa3c596fc..e3981efff 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -73,7 +73,7 @@ soundmodem.txt
 tcp.txt
 	- short blurb on how TCP output takes place.
 tulip.txt
-	- info on using DEC 21040/21041/21140 based PCI ethernet cards.
+	- info on using DEC 21040/21041/21140 based PCI Ethernet cards.
 vortex.txt
 	- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) e'net cards.
 wan-router.txt
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
index 6caabdf4b..9dafab262 100644
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
@@ -72,7 +72,7 @@ Released 1994-06-13
 
 	o Get the latest net binaries, according to current net.wisdom.
 
-	o Read the NET-2 and Ethernet HOWTO's and modify your setup.
+	o Read the NET-2 and Ethernet HOWTOs and modify your setup.
 
 	o If your parallel port has a strange address or irq,
 	  modify "linux/drivers/net/CONFIG" accordingly, or adjust
diff --git a/Documentation/networking/PLIP.txt b/Documentation/networking/PLIP.txt
index c2bb44fdb..b3539f5f9 100644
--- a/Documentation/networking/PLIP.txt
+++ b/Documentation/networking/PLIP.txt
@@ -45,13 +45,13 @@ Disadvantages of PLIP
 
 Doesn't work over a modem, like SLIP and PPP. Limited range, 15 m.
 Can only be used to connect three (?) Linux boxes. Doesn't connect to
-an existing ethernet. Isn't standard (not even de facto standard, like
+an existing Ethernet. Isn't standard (not even de facto standard, like
 SLIP).
 
 Performance
 ==========
 
-PLIP easily outperforms ethernet cards....(ups, I was dreaming, but
+PLIP easily outperforms Ethernet cards....(ups, I was dreaming, but
 it *is* getting late. EOB)
 
 PLIP hardware interconnection
diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt
index 55c2576c1..ce623ed5c 100644
--- a/Documentation/networking/arcnet-hardware.txt
+++ b/Documentation/networking/arcnet-hardware.txt
@@ -17,11 +17,11 @@ other information you have!
 INTRODUCTION TO ARCNET
 ----------------------
 
-ARCnet is a network type which works in a way similar to popular "ethernet"
+ARCnet is a network type which works in a way similar to popular Ethernet
 networks but which is also different in some very important ways.
 
 First of all, you can get ARCnet cards in at least two speeds: 2.5Mbps
-(slower than ethernet) and 100Mbps (faster than normal ethernet).  In fact,
+(slower than Ethernet) and 100Mbps (faster than normal Ethernet).  In fact,
 there are others as well, but these are less common.  The different hardware
 types, as far as I'm aware, are not compatible and so you cannot wire a
 100Mbps card to a 2.5Mbps card, and so on.  From what I hear, my driver does
@@ -29,7 +29,7 @@ work with 100Mbps cards, but I haven't been able to verify this myself,
 since I only have the 2.5Mbps variety.  It is probably not going to saturate
 your 100Mbps card.  Stop complaining :)
 
-You also cannot connect an ARCnet card to any kind of ethernet card and
+You also cannot connect an ARCnet card to any kind of Ethernet card and
 expect it to work.  
 
 There are two "types" of ARCnet - STAR topology and BUS topology.  This
@@ -41,7 +41,7 @@ true; see below under "Cabling."
 Once you get past these little stumbling blocks, ARCnet is actually quite a
 well-designed standard.  It uses something called "modified token passing"
 which makes it completely incompatible with so-called "Token Ring" cards,
-but which makes transfers much more reliable than ethernet does.  In fact,
+but which makes transfers much more reliable than Ethernet does.  In fact,
 ARCnet will guarantee that a packet arrives safely at the destination, and
 even if it can't possibly be delivered properly (ie. because of a cable
 break, or because the destination computer does not exist) it will at least
@@ -53,9 +53,9 @@ useful for realtime networks.
 
 In addition, all known ARCnet cards have an (almost) identical programming
 interface.  This means that with one "arcnet" driver you can support any
-card; whereas, with ethernet, each manufacturer uses what is sometimes a
+card; whereas, with Ethernet, each manufacturer uses what is sometimes a
 completely different programming interface, leading to a lot of different,
-sometimes very similar, ethernet drivers.  Of course, always using the same
+sometimes very similar, Ethernet drivers.  Of course, always using the same
 programming interface also means that when high-performance hardware
 facilities like PCI busmastering DMA appear, it's hard to take advantage of
 them.  Let's not go into that.
@@ -63,10 +63,10 @@ them.  Let's not go into that.
 One thing that makes ARCnet cards difficult to program for, however, is the
 limit on their packet sizes; standard ARCnet can only send packets that are
 up to 508 bytes in length.  This is smaller than the internet "bare minimum"
-of 576 bytes, let alone the ethernet MTU of 1500.  To compensate, an extra
+of 576 bytes, let alone the Ethernet MTU of 1500.  To compensate, an extra
 level of encapsulation is defined by RFC1201, which I call "packet
 splitting," that allows "virtual packets" to grow as large as 64K each,
-although they are generally kept down to the ethernet-style 1500 bytes.
+although they are generally kept down to the Ethernet-style 1500 bytes.
 
 For more information on the advantages and disadvantages (mostly the
 advantages) of ARCnet networks, you might try the "ARCnet Trade Association"
@@ -319,7 +319,7 @@ All ARCnet cards should have a total of four or five different settings:
 	- Avery's favourite: 0xD0000
 
   - the station address:  Every ARCnet card has its own "unique" network
-    address from 0 to 255.  Unlike ethernet, you can set this address
+    address from 0 to 255.  Unlike Ethernet, you can set this address
     yourself with a jumper or switch (or on some cards, with special
     software).  Since it's only 8 bits, you can only have 254 ARCnet cards
     on a network.  DON'T use 0 or 255, since these are reserved (although
@@ -1169,7 +1169,7 @@ Carl de Billy <CARL@carainfo.com> explains J3 and J4:
 
 DIP Switches:
 
-	The dipswitches accessible on the accessible end of the card while
+	The DIP switches accessible on the accessible end of the card while
         it is installed, is used to set the arcnet address.  There are 8
         switches.  Use an address from 1 to 254.
 
@@ -1184,7 +1184,7 @@ DIP Switches:
 	11111110	1
 	11111111	0	(Don't use this!)
 
-	There is another dipswitch array of 8 switches at the top of the
+	There is another array of eight DIP switches at the top of the
         card.  There are five labelled MS0-MS4 which seem to control the
         memory address, and another three labelled IO0-IO2 which seem to
         control the base I/O address of the card.
diff --git a/Documentation/networking/arcnet.txt b/Documentation/networking/arcnet.txt
index eb687ea07..17f40fb53 100644
--- a/Documentation/networking/arcnet.txt
+++ b/Documentation/networking/arcnet.txt
@@ -216,10 +216,10 @@ on the kernel command line, as detailed above.
 
 Go read the NET-2-HOWTO and ETHERNET-HOWTO for Linux; they should be
 available where you picked up this driver.  Think of your ARCnet as a
-souped-up (or down, as the case may be) ethernet card.
+souped-up (or down, as the case may be) Ethernet card.
 
 By the way, be sure to change all references from "eth0" to "arc0" in the
-HOWTOs.  Remember that ARCnet isn't a "true" ethernet, and the device name
+HOWTOs.  Remember that ARCnet isn't a "true" Ethernet, and the device name
 is DIFFERENT.
 
 
@@ -245,7 +245,7 @@ The ARCnet drivers will now sort out their names automatically.
 How do I get it to work with...?
 --------------------------------
 
-NFS: Should be fine linux->linux, just pretend you're using ethernet cards. 
+NFS: Should be fine linux->linux, just pretend you're using Ethernet cards. 
         oak.oakland.edu:/simtel/msdos/nfs has some nice DOS clients.  There
         is also a DOS-based NFS server called SOSS.  It doesn't multitask
         quite the way Linux does (actually, it doesn't multitask AT ALL) but
@@ -271,7 +271,7 @@ Windows:  See DOS :)  Trumpet Winsock works fine with either the Novell or
 
 LAN Manager and Windows for Workgroups: These programs use protocols that
         are incompatible with the internet standard.  They try to pretend
-        the cards are ethernet, and confuse everyone else on the network. 
+        the cards are Ethernet, and confuse everyone else on the network. 
         
         However, v2.00 and higher of the Linux ARCnet driver supports this
         protocol via the 'arc0e' device.  See the section on "Multiprotocol
diff --git a/Documentation/networking/baycom.txt b/Documentation/networking/baycom.txt
index 8d7547688..8d5bc3566 100644
--- a/Documentation/networking/baycom.txt
+++ b/Documentation/networking/baycom.txt
@@ -1,9 +1,41 @@
-		    LINUX DRIVER FOR BAYCOM MODEMS
+		    LINUX DRIVERS FOR BAYCOM MODEMS
 
        Thomas M. Sailer, HB9JNX/AE4WA, <sailer@ife.ee.ethz.ch>
 
-This document describes the Linux Kernel Driver for simple Baycom style
-amateur radio modems. The driver supports the following modems:
+!!NEW!! (04/98) The drivers for the baycom modems have been split into
+separate drivers as they did not share any code, and the driver
+and device names have changed.
+
+This document describes the Linux Kernel Drivers for simple Baycom style
+amateur radio modems. 
+
+The following drivers are available:
+
+baycom_ser_fdx:
+  This driver supports the SER12 modems either full or half duplex.
+  Its baud rate may be changed via the `baud' module parameter,
+  therefore it supports just about every bit bang modem on a
+  serial port. Its devices are called bcsf0 through bcsf3.
+  This is the recommended driver for SER12 type modems,
+  however if you have a broken UART clone that does not have working
+  delta status bits, you may try baycom_ser_hdx. 
+
+baycom_ser_hdx: 
+  This is an alternative driver for SER12 type modems.
+  It only supports half duplex, and only 1200 baud. Its devices
+  are called bcsh0 through bcsh3. Use this driver only if baycom_ser_fdx
+  does not work with your UART.
+
+baycom_par:
+  This driver supports the par96 and picpar modems.
+  Its devices are called bcp0 through bcp3.
+
+baycom_epp:
+  This driver supports the epp modem.
+  Its devices are called bce0 through bce3.
+  This driver is work-in-progress.
+
+The following modems are supported:
 
 ser12:  This is a very simple 1200 baud AFSK modem. The modem consists only
         of a modulator/demodulator chip, usually a TI TCM3105. The computer
@@ -28,6 +60,13 @@ picpar: This is a redesign of the par96 modem by Henning Rech, DF9IC. The modem
         an additional power supply. Furthermore, it incorporates a carrier
         detect circuitry.
 
+epp:    This is a high speed modem adaptor that connects to an enhanced parallel port.
+        Its target audience is users working over a high speed hub (76.8kbit/s).
+
+eppfpga: This is a redesign of the epp adaptor.
+
+
+
 All of the above modems only support half duplex communications. However,
 the driver supports the KISS (see below) fullduplex command. It then simply
 starts to send as soon as there's a packet to transmit and does not care
@@ -36,11 +75,11 @@ This command is required by some implementations of the DAMA channel
 access protocol.
 
 
-The Interface of the driver
+The Interface of the drivers
 
-Unlike previous drivers, the driver is no longer a character device,
-but it is now a true kernel network interface. Installation is therefore
-simple. Once installed, four interfaces named bc[0-3] are available.
+Unlike previous drivers, these drivers are no longer character devices,
+but they are now true kernel network interfaces. Installation is therefore
+simple. Once installed, four interfaces named bc{sf,sh,p,e}[0-3] are available.
 sethdlc from the ax25 utilities may be used to set driver states etc.
 Users of userland AX.25 stacks may use the net2kiss utility (also available
 in the ax25 utilities package) to convert packets of a network interface
@@ -50,27 +89,27 @@ me for WAMPES which allows attaching a kernel network interface directly.
 
 Configuring the driver
 
-Every time the driver is inserted into the kernel, it has to know which
+Every time a driver is inserted into the kernel, it has to know which
 modems it should access at which ports. This can be done with the setbaycom
 utility. If you are only using one modem, you can also configure the
 driver from the insmod command line (or by means of an option line in
 /etc/conf.modules).
 
 Examples:
-  insmod baycom modem=1 iobase=0x3f8 irq=4 options=1
-  sethdlc -i bc0 -p type ser12 io 0x3f8 irq 4 options 1
+  insmod baycom_ser_fdx mode="ser12*" iobase=0x3f8 irq=4
+  sethdlc -i bcsf0 -p mode "ser12*" io 0x3f8 irq 4
 
 Both lines configure the first port to drive a ser12 modem at the first
-serial port (COM1 under DOS). options=1 instructs the driver to use
+serial port (COM1 under DOS). The * in the mode parameter instructs the driver to use
 the software DCD algorithm (see below).
 
-  insmod baycom modem=2 iobase=0x378 irq=7 options=1
-  sethdlc -i bc0 -p type par96 io 0x378 irq 7 options 1
+  insmod baycom_par mode="picpar" iobase=0x378
+  sethdlc -i bcp0 -p mode "picpar" io 0x378
+
+Both lines configure the first port to drive a picpar modem at the
+first parallel port (LPT1 under DOS). (Note: picpar implies
+hardware DCD, par96 implies software DCD).
 
-Both lines configure the first port to drive a par96 or par97 modem at the
-first parallel port (LPT1 under DOS). options=1 instructs the driver to use
-the software DCD algorithm (see below).
-  
 The channel access parameters can be set with sethdlc -a or kissparms.
 Note that both utilities interpret the values slightly differently.
 
@@ -93,25 +132,26 @@ par96:  the software DCD algorithm for this type of modem is rather poor.
         feeds the DCD input of the PAR96 modem, the use of the hardware
         DCD circuitry is recommended.
 
-picpar: the picpar modem features builtin DCD hardware, which is highly
+picpar: the picpar modem features a builtin DCD hardware, which is highly
         recommended.
 
 
 
 Compatibility with the rest of the Linux kernel
 
-The serial driver, the line printer (lp) driver and the baycom driver compete
+The serial driver and the baycom serial drivers compete
 for the same hardware resources. Of course only one driver can access a given
 interface at a time. The serial driver grabs all interfaces it can find at
-startup time. Therefore the baycom driver subsequently won't be able to
+startup time. Therefore the baycom drivers subsequently won't be able to
 access a serial port. You might therefore find it necessary to release
 a port owned by the serial driver with 'setserial /dev/ttyS# uart none', where
-# is the number of the interface. The baycom driver does not reserve any
-port at startup, unless one is specified on the 'insmod' command line. Another
-method to solve the problem is to compile all three drivers as modules and
-leave it to kerneld to load the correct driver depending on the application.
-
+# is the number of the interface. The baycom drivers do not reserve any
+ports at startup, unless one is specified on the 'insmod' command line. Another
+method to solve the problem is to compile all drivers as modules and
+leave it to kmod to load the correct driver depending on the application.
 
+The parallel port drivers (baycom_par, baycom_epp) now use the parport subsystem
+to arbitrate the ports between different client drivers.
 
 vy 73s de
 Tom Sailer, sailer@ife.ee.ethz.ch
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 895df60df..78561b9f4 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -72,7 +72,7 @@ loaded at run-time as a device driver module.
 1.2.2 Files in the Driver Archive:
 
   readme.txt  - this file
-  release.txt - known defects and modifcation log
+  release.txt - known defects and modification log
   cs89x0.c    - driver C code
   cs89x0.h    - driver header file
   cs89x0.o    - pre-compiled module (for v2.0 kernel)
@@ -196,7 +196,7 @@ Example:
 
     insmod cs89x0.o io=0x200 irq=0xA media=aui
 
-This exmaple loads the module and configures the adapter to use an IO port base
+This example loads the module and configures the adapter to use an IO port base
 address of 200h, interrupt 10, and use the AUI media connection.  The following
 configuration options are available on the command line:
 
@@ -235,7 +235,7 @@ is:
   * irq 
   * media type (no autodetect)
 
-The following addtional parameters are CS89XX defaults (values used with no 
+The following additional parameters are CS89XX defaults (values used with no 
 EEPROM or command-line argument).
 
   * DMA Burst = enabled
@@ -545,8 +545,8 @@ I/O Address    	Device                        IRQ      Device
                                               12       Mouse (PS/2)                              
 Memory Address  Device                        13       Math Coprocessor
 --------------  ---------------------         14       Hard Disk controller
-A000-BFFF	EGA Graphics Adpater
-A000-C7FF	VGA Graphics Adpater
+A000-BFFF	EGA Graphics Adapter
+A000-C7FF	VGA Graphics Adapter
 B000-BFFF	Mono Graphics Adapter
 B800-BFFF	Color Graphics Adapter
 E000-FFFF	AT BIOS
diff --git a/Documentation/networking/de4x5.txt b/Documentation/networking/de4x5.txt
index d82b19c74..88378de77 100644
--- a/Documentation/networking/de4x5.txt
+++ b/Documentation/networking/de4x5.txt
@@ -1,5 +1,5 @@
     Originally,   this  driver  was    written  for the  Digital   Equipment
-    Corporation series of EtherWORKS ethernet cards:
+    Corporation series of EtherWORKS Ethernet cards:
 
         DE425 TP/COAX EISA
 	DE434 TP PCI
diff --git a/Documentation/networking/dgrs.txt b/Documentation/networking/dgrs.txt
index 58af33a08..d37d1c41a 100644
--- a/Documentation/networking/dgrs.txt
+++ b/Documentation/networking/dgrs.txt
@@ -1,7 +1,7 @@
 	The Digi Intl. RightSwitch SE-X (dgrs) Device Driver
 
 This is a Linux driver for the Digi International RightSwitch SE-X
-EISA and PCI boards.  These are 4 (EISA) or 6 (PCI) port ethernet
+EISA and PCI boards.  These are 4 (EISA) or 6 (PCI) port Ethernet
 switches and a NIC combined into a single board.  This driver can
 be compiled into the kernel statically or as a loadable module.
 
diff --git a/Documentation/networking/eql.txt b/Documentation/networking/eql.txt
index 0694f528c..0f1550150 100644
--- a/Documentation/networking/eql.txt
+++ b/Documentation/networking/eql.txt
@@ -33,7 +33,7 @@
   TCP implementation is pretty fast though.--)
 
 
-  I suggest to ISP's out there that it would probably be fair to charge
+  I suggest to ISPs out there that it would probably be fair to charge
   a load-balancing client 75% of the cost of the second line and 50% of
   the cost of the third line etc...
 
diff --git a/Documentation/networking/ethertap.txt b/Documentation/networking/ethertap.txt
index 8b7ab4be4..27202efba 100644
--- a/Documentation/networking/ethertap.txt
+++ b/Documentation/networking/ethertap.txt
@@ -7,7 +7,7 @@ Introduction
 ============
 
 Ethertap provides packet reception and transmission for user
-space programs. It can be viewed as a simple ethernet device,
+space programs. It can be viewed as a simple Ethernet device,
 which instead of receiving packets from a network wire, it receives
 them from user space.
 
diff --git a/Documentation/networking/ewrk3.txt b/Documentation/networking/ewrk3.txt
index bea97f4e2..0427c6c8f 100644
--- a/Documentation/networking/ewrk3.txt
+++ b/Documentation/networking/ewrk3.txt
@@ -35,9 +35,9 @@ sequences). To utilise this ability, you have to do 8 things:
     'ifconfig eth?? down' then 'rmmod ewrk3'.
 
 The performance we've  achieved so far  has been measured through the 'ttcp'
-tool   at 975kB/s.  This  measures  the  total  tcp  stack performance which
+tool   at 975kB/s.  This  measures  the  total  TCP  stack performance which
 includes the   card,  so don't  expect   to get   much nearer  the  1.25MB/s
-theoretical ethernet rate.
+theoretical Ethernet rate.
 
 
 Enjoy!
diff --git a/Documentation/networking/filter.txt b/Documentation/networking/filter.txt
index 370cb92f8..be865f352 100644
--- a/Documentation/networking/filter.txt
+++ b/Documentation/networking/filter.txt
@@ -15,7 +15,7 @@ the same filter code structure as the BSD Berkeley Packet Filter
 (BPF), so refering to the BSD bpf.4 manpage is very helpful in
 creating filters.
 
-LSF is much simpler that BPF. One does not have to worry about
+LSF is much simpler than BPF. One does not have to worry about
 devices or anything like that. You simply create your filter
 code, send it to the kernel via the SO_ATTACH_FILTER ioctl and
 if your filter code passes the kernel check on it, you then
diff --git a/Documentation/networking/framerelay.txt b/Documentation/networking/framerelay.txt
index f02b133d1..1a0b72044 100644
--- a/Documentation/networking/framerelay.txt
+++ b/Documentation/networking/framerelay.txt
@@ -8,8 +8,8 @@ Each DLCI is a point-to-point link between your machine and a remote one.
 As such, a separate device is needed to accommodate the routing.  Within the
 net-tools archives is 'dlcicfg'.  This program will communicate with the
 base "DLCI" device, and create new net devices named 'dlci00', 'dlci01'... 
-The configuration script will ask you how many DLCI's you need, as well as
-how many DLCI's you want to assign to each Frame Relay Access Device (FRAD).
+The configuration script will ask you how many DLCIs you need, as well as
+how many DLCIs you want to assign to each Frame Relay Access Device (FRAD).
 
 The DLCI uses a number of function calls to communicate with the FRAD, all
 of which are stored in the FRAD's private data area.  assoc/deassoc, 
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index ab794ef77..1d015b2e2 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1,8 +1,10 @@
-/proc/sys/net/ipv4/* variables:
+/proc/sys/net/ipv4/* Variables:
 
-ip_forwarding - "SNMP" BOOLEAN
-	2 - disabled (default)
-	1 - enabled
+ip_forward - BOOLEAN
+	0 - disabled (default)
+	not 0 - enabled 
+
+	Forward Packets between interfaces.
 
 	This variable is special, its change resets all configuration
 	parameters to their default state (RFC1122 for hosts, RFC1812
@@ -11,32 +13,11 @@ ip_forwarding - "SNMP" BOOLEAN
 ip_default_ttl - INTEGER
 	default 64
 
-ip_log_martians - BOOLEAN
-	log packets with strange or impossible addresses.
-	default TRUE (router)
-		FALSE (host)
-
-ip_accept_redirects - BOOLEAN
-	Accept ICMP redirect messages.
-	default TRUE (host)
-		FALSE (router)
-
-ip_secure_redirects - BOOLEAN
-	Accept ICMP redirect messages only for gateways,
-	listed in default gateway list.
-	default TRUE
-
 ip_addrmask_agent - BOOLEAN
 	Reply to ICMP ADDRESS MASK requests.
 	default TRUE (router)
 		FALSE (host)
 
-ip_rfc1620_redirects - BOOLEAN
-	Send(router) or accept(host) RFC1620 shared media redirects.
-	Overrides ip_secure_redirects.
-	default TRUE (should be FALSE for distributed version,
-		      but I use it...)
-
 ip_bootp_agent - BOOLEAN
 	Accept packets with source address of sort 0.b.c.d
 	and destined to this host, broadcast or multicast.
@@ -44,46 +25,10 @@ ip_bootp_agent - BOOLEAN
 
 	default FALSE
 
-ip_bootp_relay - BOOLEAN
-	Accept packets with source address 0.b.c.d destined
-	not to this host as local ones. It is supposed, that
-	BOOTP relay deamon will catch and forward such packets.
-
-	default FALSE
-	Not Implemented Yet.
-
-
-ip_source_route - BOOLEAN
-	Accept packets with SRR option.
-	default TRUE (router)
-		FALSE (host)
-
-
 ip_no_pmtu_disc - BOOLEAN
 	Disable Path MTU Discovery.
 	default FALSE
 
-ip_rfc1812_filter - INTEGER
-	2 - do source validation by reversed path, as specified in RFC1812
-	    Recommended option for single homed hosts and stub network
-	    routers. Could cause troubles for complicated (not loop free)
-	    networks running a slow unreliable protocol (sort of RIP),
-	    or using static routes.
-
-	1 - (DEFAULT) Weaker form of RP filtering: drop all the packets
-	    that look as sourced at a directly connected interface, but
-	    were input from another interface.
-	    
-	0 - No source validation. 
-
-	NOTE: do not disable this option! All BSD derived routing software
-	(sort of gated, routed etc. etc.) is confused by such packets,
-	even if they are valid.
-
-	NOTE: this option is turned on per default only when ip_forwarding
-	is on. For non-forwarding hosts it doesn't make much sense and 
-	makes some legal multihoming configurations impossible.
-
 ip_fib_model - INTEGER
 	0 - (DEFAULT) Standard model. All routes are in class MAIN.
 	1 - default routes go to class DEFAULT. This mode should
@@ -125,6 +70,7 @@ tcp_retries2 - INTEGER
 tcp_max_delay_acks - INTEGER
 tcp_fin_timeout - INTEGER
 tcp_max_ka_probes - INTEGER
+tcp_hoe_retransmits - INTEGER
 	Undocumented for now.
 
 tcp_syncookies - BOOLEAN
@@ -143,6 +89,20 @@ tcp_syn_taildrop  - BOOLEAN
 tcp_max_syn_backlog - INTEGER
 	Undocumented (work in progress)
 
+tcp_window_scaling - BOOLEAN
+	Enable window scaling as defined in RFC1323.
+
+tcp_timestamps - BOOLEAN
+	Enable timestamps as defined in RFC1323.
+
+tcp_sack - BOOLEAN
+	Enable select acknowledgements.
+
+tcp_retrans_collapse - BOOLEAN
+	Bug-to-bug compatibility with some broken printers.
+	On retransmit try to send bigger packets to work around bugs in
+	certain TCP stacks.
+
 ip_local_port_range - 2 INTEGERS
 	Defines the local port range that is used by TCP and UDP to
 	choose the local port. The first number is the first, the 
@@ -155,10 +115,94 @@ icmp_echo_ignore_broadcasts - BOOLEAN
 	ICMP ECHO requests sent to it or just those to broadcast/multicast
 	addresses, respectively.
 
+icmp_destunreach_rate - INTEGER
+icmp_paramprob_rate - INTEGER
+icmp_timeexceed_rate - INTEGER
+icmp_echoreply_rate - INTEGER (not enabled per default)
+	Limit the maximal rates for sending ICMP packets to specifc targets.
+	0 to disable any limiting, otherwise the maximal rate in jiffies(1)
+	See the source for more information.
+
+
+(1) Jiffie: internal timeunit for the kernel. On the i386 1/100s, on the
+Alpha 1/1024s. See the HZ define in /usr/include/asm/param.h for the exact
+value on your system. 
+
+conf/interface/*: 
+conf/all/* is special and changes the settings for all interfaces.
+	Change special settings per interface.
+
+log_martians - BOOLEAN
+	Log packets with impossible addresses to kernel log.
+
+accept_redirects - BOOLEAN
+	Accept ICMP redirect messages.
+	default TRUE (host)
+		FALSE (router)
+
+forwarding - BOOLEAN
+	Enable IP forwarding on this interface.
+
+mc_forwarding - BOOLEAN
+	Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE
+	and a multicast routing daemon is required.
+
+proxy_arp - BOOLEAN
+	Do proxy arp.
+
+shared_media - BOOLEAN
+	undocumented.
+
+secure_redirects - BOOLEAN
+	Accept ICMP redirect messages only for gateways,
+	listed in default gateway list.
+	default TRUE
+
+redirects - BOOLEAN
+	Send(router) or accept(host) RFC1620 shared media redirects.
+	Overrides ip_secure_redirects.
+	default TRUE (should be FALSE for distributed version,
+		      but I use it...)
+
+bootp_relay - BOOLEAN
+	Accept packets with source address 0.b.c.d destined
+	not to this host as local ones. It is supposed, that
+	BOOTP relay deamon will catch and forward such packets.
+
+	default FALSE
+	Not Implemented Yet.
+
+accept_source_route - BOOLEAN
+	Accept packets with SRR option.
+	default TRUE (router)
+		FALSE (host)
+
+rp_filter - INTEGER
+	2 - do source validation by reversed path, as specified in RFC1812
+	    Recommended option for single homed hosts and stub network
+	    routers. Could cause troubles for complicated (not loop free)
+	    networks running a slow unreliable protocol (sort of RIP),
+	    or using static routes.
+
+	1 - (DEFAULT) Weaker form of RP filtering: drop all the packets
+	    that look as sourced at a directly connected interface, but
+	    were input from another interface.
+	    
+	0 - No source validation. 
+
+	NOTE: do not disable this option! All BSD derived routing software
+	(sort of gated, routed etc. etc.) is confused by such packets,
+	even if they are valid. When enabled it also prevents ip spoofing
+	in some limited fashion.
+
+	NOTE: this option is turned on per default only when ip_forwarding
+	is on. For non-forwarding hosts it doesn't make much sense and 
+	makes some legal multihoming configurations impossible.
+
 Alexey Kuznetsov.
 kuznet@ms2.inr.ac.ru
 
 Updated by:
 Andi Kleen
 ak@muc.de
-$Id: ip-sysctl.txt,v 1.5 1997/10/17 03:58:23 tdyas Exp $
+$Id: ip-sysctl.txt,v 1.7 1998/05/02 12:05:00 davem Exp $
diff --git a/Documentation/networking/lapb-module.txt b/Documentation/networking/lapb-module.txt
index 2b564a5f5..30c73f09f 100644
--- a/Documentation/networking/lapb-module.txt
+++ b/Documentation/networking/lapb-module.txt
@@ -6,7 +6,7 @@ The LAPB module will be a separately compiled module for use by any parts of
 the Linux operating system that require a LAPB service. This document
 defines the interfaces to, and the services provided by this module. The
 term module in this context does not imply that the LAPB module is a
-seperately loadable module, although it may be. The term module is used in
+separately loadable module, although it may be. The term module is used in
 its more standard meaning.
 
 The interface to the LAPB module consists of functions to the module,
diff --git a/Documentation/networking/multicast.txt b/Documentation/networking/multicast.txt
index a8539007a..2bd6fd9ba 100644
--- a/Documentation/networking/multicast.txt
+++ b/Documentation/networking/multicast.txt
@@ -1,6 +1,5 @@
 Behaviour of cards under Multicast. This is how they currently 
-behave not what the hardware can do. In particular all the 8390 based
-cards don't use the onboard hash filter, and the lance driver doesn't
+behave not what the hardware can do - i.e. the lance driver doesn't
 use its filter, even though the code for loading it is in the DEC
 lance based driver.
 
diff --git a/Documentation/networking/policy-routing.txt b/Documentation/networking/policy-routing.txt
index 9cf967737..376dd6e80 100644
--- a/Documentation/networking/policy-routing.txt
+++ b/Documentation/networking/policy-routing.txt
@@ -1,7 +1,7 @@
 Classes
 -------
 
-	"Class" is complete routing table in common sence.
+	"Class" is a complete routing table in common sense.
 	I.e. it is tree of nodes (destination prefix, tos, metric)
 	with attached information: gateway, device etc.
 	This tree is looked up as specified in RFC1812 5.2.4.3
@@ -16,7 +16,7 @@ Classes
 	THROW  - abort route lookup in this class.
 
 
-	Currently number of classes is limited by 255
+	Currently the number of classes is limited to 255
 	(0 is reserved for "not specified class")
 
 	Three classes are builtin:
@@ -34,7 +34,7 @@ Classes
 
 Rules
 -----
-	Rule is record of (src prefix, src interface, tos, dst prefix)
+	Rule is a record of (src prefix, src interface, tos, dst prefix)
 	with attached information.
 
 	Rule types:
@@ -65,15 +65,15 @@ Lookup algorithm
 ----------------
 
 	We scan rules list, and if a rule is matched, apply it.
-	If route is found, return it.
-	If it is not found or THROW node was matched, continue
+	If a route is found, return it.
+	If it is not found or a THROW node was matched, continue
 	to scan rules.
 
 Applications
 ------------
 
-1.	Just ignore classes. All the routes are put to MAIN class
-	(and/or to DEFAULT class).
+1.	Just ignore classes. All the routes are put into MAIN class
+	(and/or into DEFAULT class).
 
 	HOWTO:  iproute add PREFIX [ tos TOS ] [ gw GW ] [ dev DEV ]
 		[ metric METRIC ] [ reject ] ... (look at iproute utility)
@@ -89,13 +89,13 @@ Applications
 		[ dev INPUTDEV] [ pref PREFERENCE ] route [ gw GATEWAY ]
 		[ dev OUTDEV ] .....
 
-	Warning: just now size of routing table in this approach is
-	limited by 256. If someone will like this model, I'll
+	Warning: As of now the size of the routing table in this
+	approach is limited to 256. If someone likes this model, I'll
 	relax this limitation.
 
 3.	OSPF classes (see RFC1583, RFC1812 E.3.3)
 	Very clean, stable and robust algorithm for OSPF routing
-	domains. Unfortunately, it is not used widely in the Internet.
+	domains. Unfortunately, it is not widely used in the Internet.
 
 	Proposed setup:
 	255 local addresses
@@ -124,8 +124,8 @@ Applications
 
 4.	The Variant Router Requirements Algorithm (RFC1812 E.3.2)
 	Create 16 classes for different TOS values.
-	It is funny, but pretty useless algorithm.
-	I listed it just to show power of new routing code.
+	It is a funny, but pretty useless algorithm.
+	I listed it just to show the power of new routing code.
 
 5.	All the variety of combinations......
 
@@ -139,10 +139,10 @@ GATED
 
 IMPORTANT NOTE
 --------------
-	route.c has compilation time switch CONFIG_IP_LOCAL_RT_POLICY.
+	route.c has a compilation time switch CONFIG_IP_LOCAL_RT_POLICY.
 	If it is set, locally originated packets are routed
-	using all the policy list. It is not very convenient and
-	pretty ambiguous, when used with NAT and masquerading.
+	using all the policy list. This is not very convenient and
+	pretty ambiguous when used with NAT and masquerading.
 	I set it to FALSE by default.
 
 
diff --git a/Documentation/networking/routing.txt b/Documentation/networking/routing.txt
index 32dfeb2cd..f9a6ad378 100644
--- a/Documentation/networking/routing.txt
+++ b/Documentation/networking/routing.txt
@@ -27,17 +27,17 @@ NEWS for user.
 - New interface addressing paradigm.
   Assignment of address ranges to interface,
   multiple prefixes etc. etc.
-  Do not bother, it is compatible with old one. Moreover:
-- You more need not do "route add aaa.bbb.ccc... eth0",
+  Do not bother, it is compatible with the old one. Moreover:
+- You don't need to do "route add aaa.bbb.ccc... eth0" anymore,
   it is done automatically.
 - "Abstract" UNIX sockets and security enhancements.
-  It is necessary to use TIRPC and TLI emulation library.
+  This is necessary to use TIRPC and TLI emulation library.
 
 NEWS for hacker.
 
 - New destination cache. Flexible, robust and just beautiful.
 - Network stack is reordered, simplified, optimized, a lot of bugs fixed.
-  (well, and new bugs are introduced, but I haven't seen them yet 8))
+  (well, and new bugs were introduced, but I haven't seen them yet 8))
   It is difficult to describe all the changes, look into source.
 
 If you see this file, then this patch works 8)
diff --git a/Documentation/networking/sktr.txt b/Documentation/networking/sktr.txt
new file mode 100644
index 000000000..a35332af1
--- /dev/null
+++ b/Documentation/networking/sktr.txt
@@ -0,0 +1,147 @@
+Text file for the Linux SysKonnect Token Ring ISA/PCI Adapter Driver.
+	Text file by: Jay Schulist <jschlst@samba.anu.edu.au>
+
+The Linux SysKonnect Token Ring driver works with the SysKonnect TR4/16(+) ISA,
+SysKonnect TR4/16(+) PCI, SysKonnect TR4/16 PCI, and older revisions of the
+SK NET TR4/16 ISA card.
+
+Latest information on this driver can be obtained on the Linux-SNA WWW site.
+Please point your browser to: 
+http://samba.anu.edu.au/linux-sna/documents/drivers/SysKonnect/
+
+Many thanks to Christoph Goos for his excellent work on this driver and
+SysKonnect for donating the adapters to Linux-SNA for the testing and maintaince
+of this device driver.
+
+Important information to be noted:
+1. Adapters can be slow to open (~20 secs) and close (~5 secs), please be 
+   patient.
+2. This driver works very well when autoprobing for adapters. Why even 
+   think about those nasty io/int/dma settings of modprobe when the driver 
+   will do it all for you!
+
+This driver is rather simple to use. Select Y to Token Ring adapter support
+in the kernel configuration. A choice for SysKonnect Token Ring adapters will
+appear. This drives supports all SysKonnect ISA and PCI adapters. Choose this
+option. I personally recommend compiling the driver as a module (M), but if you
+you would like to compile it staticly answer Y instead.
+
+This driver supports multiple adapters without the need to load multiple copies
+of the driver. You should be able to load up to 7 adapters without any kernel
+modifications, if you are in need of more please contact the maintainer of this
+driver.
+
+Load the driver either by lilo/loadlin or as a module. When a module using the
+following command will suffice for most:
+
+# modprobe sktr
+
+This will produce output similar to the following: (Output is user specific)
+
+sktr.c: v1.01 08/29/97 by Christoph Goos
+tr0: SK NET TR 4/16 PCI found at 0x6100, using IRQ 17.
+tr1: SK NET TR 4/16 PCI found at 0x6200, using IRQ 16.
+tr2: SK NET TR 4/16 ISA found at 0xa20, using IRQ 10 and DMA 5.
+
+Now just setup the device via ifconfig and set and routes you may have. After
+this you are ready to start sending some tokens.
+
+Errata:
+For anyone wondering where to pick up the SysKonnect adapters please browse
+to http://www.syskonnect.com
+
+This driver is under the GNU General Public License. Its Firmware image is 
+included as an initialized C-array and is licensed by SysKonnect to the Linux 
+users of this driver. However no waranty about its fitness is expressed or 
+implied by SysKonnect.
+
+Below find attached the setting for the SK NET TR 4/16 ISA adapters
+-------------------------------------------------------------------
+
+                    ***************************
+                    ***   C O N T E N T S   ***
+                    ***************************
+
+                1) Location of DIP-Switch W1
+                2) Default settings
+                3) DIP-Switch W1 description
+
+
+  ==============================================================
+  CHAPTER 1     LOCATION OF DIP-SWITCH
+  ==============================================================
+
+UÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
+þUÄÄÄÄÄÄ¿                         UÄÄÄÄÄ¿            UÄÄÄ¿         þ
+þAÄÄÄÄÄÄU                      W1 AÄÄÄÄÄU     UÄÄÄÄ¿ þ   þ         þ
+þUÄÄÄÄÄÄ¿                                     þ    þ þ   þ      UÄÄÅ¿
+þAÄÄÄÄÄÄU              UÄÄÄÄÄÄÄÄÄÄÄ¿          AÄÄÄÄU þ   þ      þ  þþ
+þUÄÄÄÄÄÄ¿              þ           þ          UÄÄÄ¿  AÄÄÄU      AÄÄÅU
+þAÄÄÄÄÄÄU              þ TMS380C26 þ          þ   þ                þ
+þUÄÄÄÄÄÄ¿              þ           þ          AÄÄÄU                AÄ¿
+þAÄÄÄÄÄÄU              þ           þ                               þ þ
+þ                      AÄÄÄÄÄÄÄÄÄÄÄU                               þ þ
+þ                                                                  þ þ
+þ                                                                  AÄU
+þ                                                                  þ
+þ                                                                  þ
+þ                                                                  þ
+þ                                                                  þ
+AÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄAÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄAÄÄÄÄÄÄÄÄÄU
+             AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU  AÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄU
+
+  ==============================================================
+  CHAPTER 2     DEFAULT SETTINGS
+  ==============================================================
+
+          W1    1  2  3  4  5  6  7  8
+        +------------------------------+
+        | ON    X                      |
+        | OFF      X  X  X  X  X  X  X |
+        +------------------------------+
+
+        W1.1 = ON               Adapter drives address lines SA17..19
+        W1.2 - 1.5 = OFF        BootROM disabled
+        W1.6 - 1.8 = OFF        I/O address 0A20h
+
+  ==============================================================
+  CHAPTER 3     DIP SWITCH W1 DESCRIPTION
+  ==============================================================
+
+      UÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄ¿  ON
+      þ 1 þ 2 þ 3 þ 4 þ 5 þ 6 þ 7 þ 8 þ
+      AÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄAÄÄÄU  OFF
+      |AD | BootROM Addr. |  I/O      |
+      +-+-+-------+-------+-----+-----+
+        |         |             |
+        |         |             +------ 6     7     8
+        |         |                     ON    ON    ON       1900h
+        |         |                     ON    ON    OFF      0900h
+        |         |                     ON    OFF   ON       1980h
+        |         |                     ON    OFF   OFF      0980h
+        |         |                     OFF   ON    ON       1b20h
+        |         |                     OFF   ON    OFF      0b20h
+        |         |                     OFF   OFF   ON       1a20h
+        |         |                     OFF   OFF   OFF      0a20h    (+)
+        |         |
+        |         |
+        |         +-------- 2     3     4     5
+        |                   OFF   x     x     x       disabled  (+)
+        |                   ON    ON    ON    ON      C0000
+        |                   ON    ON    ON    OFF     C4000
+        |                   ON    ON    OFF   ON      C8000
+        |                   ON    ON    OFF   OFF     CC000
+        |                   ON    OFF   ON    ON      D0000
+        |                   ON    OFF   ON    OFF     D4000
+        |                   ON    OFF   OFF   ON      D8000
+        |                   ON    OFF   OFF   OFF     DC000
+        |
+        |
+        +----- 1
+               OFF    adapter does NOT drive SA<17..19>
+               ON     adapter drives SA<17..19>  (+)
+
+
+        (+) means default setting
+
+                       ********************************
diff --git a/Documentation/networking/soundmodem.txt b/Documentation/networking/soundmodem.txt
index f50985720..47d1dfc3c 100644
--- a/Documentation/networking/soundmodem.txt
+++ b/Documentation/networking/soundmodem.txt
@@ -2,13 +2,13 @@
 
        Thomas M. Sailer, HB9JNX/AE4WA, <sailer@ife.ee.ethz.ch>
 
-This driver allows either SoundBlaster (sbc) or WindowsSoundSystem (wss)
+This driver allows either SoundBlaster (sbc) or Windows Sound System (wss)
 compatible soundcards to be used as either 1200 baud AFSK or 9600 baud FSK
 AX.25 packet radio modems. Only half duplex operation is supported; an
 attempt to include full duplex support failed because the hardware did
 not support it (it appeared that the card only provides one DMA channel,
-although the Codec chip would support two channels). The driver needs
-some processing power! A 486DX/2 66MHz is a minimum requirement, otherwise
+although the codec chip would support two channels). The driver needs
+some processing power! A 66 MHz 486 DX2 is a minimum requirement.  Otherwise
 interactive performance of the computer may become sluggish. This driver
 does *not* support telephone modem standards, it is intended for radio
 use only.
diff --git a/Documentation/networking/tlan.txt b/Documentation/networking/tlan.txt
new file mode 100644
index 000000000..d3de6ccd1
--- /dev/null
+++ b/Documentation/networking/tlan.txt
@@ -0,0 +1,140 @@
+TLAN driver for Linux, version 1.0
+README
+
+Well, I'm back.  The TLAN driver seems pretty stable, so I'm
+declaring this cycle of development finished, and calling the
+driver 1.0.  I will, of course continue to work on improving
+the driver, and work towards a 2.0 release.
+
+
+James
+james@sovereign.org
+
+
+
+I.  Supported Devices.
+
+    Only PCI devices will work with this driver.
+
+    Supported:
+    Vendor ID	Device ID	Name
+    0e11	ae32		Compaq Netelligent 10/100 TX PCI UTP
+    0e11	ae34		Compaq Netelligent 10 T PCI UTP
+    0e11	ae35		Compaq Integrated NetFlex 3/P
+    0e11	ae40		Compaq Netelligent Dual 10/100 TX PCI UTP
+    0e11	ae43		Compaq Netelligent Integrated 10/100 TX UTP
+    0e11	b011		Compaq Netelligent 10/100 TX Embedded UTP
+    0e11	b012		Compaq Netelligent 10 T/2 PCI UTP/Coax
+    0e11	b030		Compaq Netelligent 10/100 TX UTP
+    0e11	f130		Compaq NetFlex 3/P
+    0e11	f150		Compaq NetFlex 3/P
+    108d	0012		Olicom OC-2325	
+    108d	0013		Olicom OC-2183
+    108d	0014		Olicom OC-2326	
+
+
+    Caveats:
+    
+    I am not sure if 100BaseTX daughterboards (for those cards which
+    support such things) will work.  I haven't had any solid evidence
+    either way.
+
+    However, if a card supports 100BaseTx without requiring an add
+    on daughterboard, it should work with 100BaseTx.
+
+    The "Netelligent 10 T/2 PCI UTP/Coax" (b012) device is untested,
+    but I do not expect any problems.
+    
+
+II.  Building the Driver.
+
+    The TLAN driver may be compiled into the kernel, or it may be compiled
+    as a module separately, or in the kernel.  A patch is included for
+    2.0.29 (which also works for 2.0.30, 2.0.31, and 2.0.32).
+
+    To compile it as part of the kernel:
+        1. Download and untar the TLAN driver package.
+	2. If your kernel is 2.1.45 or later, you do not need to patch the
+           kernel sources.  Copy the tlan.c and tlan.h to drivers/net in
+           the kernel source tree.
+        3. Otherwise, apply the appropriate patch for your kernel.  For
+	   example:
+
+	       cd /usr/src/linux
+               patch -p1 < kernel.2.0.29
+
+        4. Copy the files tlan.c and tlan.h from the TLAN package to the
+           directory drivers/net in the Linux kernel source tree.
+        5. Configure your kernel for the TLAN driver.  Answer 'Y' when
+           prompted to ask about experimental code (the first question).
+           Then answer 'Y' when prompted if to include TI ThunderLAN
+           support.  If you want the driver compiled as a module, answer 'M'
+           instead of 'Y'.
+        6. Make the kernel and, if necessary, the modules.
+    
+    To compile the TLAN driver independently:
+        1. Download and untar the TLAN driver package.
+        2. Change to the tlan directory.
+        3. If you are NOT using a versioned kernel (ie, want an non-
+           versioned module), edit the Makefile, and comment out the
+           line:
+                 MODVERSIONS = -DMODVERSIONS
+        4. Run 'make'.
+
+
+III.  Driver Options
+	1. You can append debug=x to the end of the insmod line to get
+           debug messages, where x is a bit field where the bits mean
+	   the following:
+	   
+	   0x01		Turn on general debugging messages.
+	   0x02		Turn on receive debugging messages.
+	   0x04		Turn on transmit debugging messages.
+	   0x08		Turn on list debugging messsages.
+
+	2. You can append aui=1 to the end of the insmod line to cause
+           the adapter to use the AUI interface instead of the 10 Base T
+           interface.  This is also what to do if you want to use the BNC
+	   connector on a TLAN based device.  (Setting this option on a
+	   device that does not have an AUI/BNC connector will probably
+	   cause it to not function correctly.)
+
+	4. You can set duplex=1 to force half duplex, and duplex=2 to
+	   force full duplex.
+
+	5. You can set speed=10 to force 10Mbs operation, and speed=100Mbs
+	   to force 100Mbs operation. (I'm not sure what will happen
+	   if a card which only supports 10Mbs is forced into 100Mbs
+	   mode.)
+
+	3. If the driver is built into the kernel, you can use the 3rd
+	   and 4th parameters to set aui and debug respectively.  For
+	   example:
+
+	   ether=0,0,0x1,0x7,eth0
+
+	   This sets aui to 0x1 and debug to 0x7, assuming eth0 is a
+	   supported TLAN device.
+
+	   The bits in the third byte are assigned as follows:
+
+		0x01 = aui
+		0x02 = use SA_INTERRUPT flag when reserving the irq.
+		0x04 = use half duplex
+		0x08 = use full duplex
+		0x10 = use 10BaseT
+		0x20 = use 100BaseTx
+
+
+IV.  Things to try if you have problems.
+	1. Make sure your card's PCI id is among those listed in
+	   section I, above.
+	1. Make sure routing is correct.
+	2. If you are using a 2.1.x kernel, try to duplicate the
+	   problem on a 2.0.x (preferably 2.0.29 or 2.0.30) kernel.
+
+
+There is also a tlan mailing list which you can join by sending "subscribe tlan"
+in the body of an email to majordomo@vuser.vu.union.edu.
+
+
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index 45533ec1b..4a83d1bf2 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -1,7 +1,7 @@
-                Tulip ethernet card driver
+                Tulip Ethernet Card Driver
 
 The Tulip driver is developed by Donald Becker and changed by
-Takashi Manabe. This driver is designed to work with PCI ethernet
+Takashi Manabe. This driver is designed to work with PCI Ethernet
 cards which use the DECchip DC21x4x family. This driver hopefully
 works with all of 1.2.x and 1.3.x kernels, but I tested only
 with 1.2.13, 1.3.39, 1.3.49, 1.3.52, 1.3.57 and later.
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index 1ffeb14bc..5fc1afffc 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -41,7 +41,7 @@ This kernel module introduces the notion of a WAN Link Driver (WLD) to Linux
 operating system and provides generic hardware-independent services for such
 drivers.  Why can existing Linux network device interface not be used for
 this purpose?  Well, it can.  However, there are a few key differences between
-a typical network interface (e.g. ethernet) and a WAN link.
+a typical network interface (e.g. Ethernet) and a WAN link.
 
 Many WAN protocols, such as X.25 and frame relay, allow for multiple logical
 connections (known as `virtual circuits' in X.25 terminology) over a single
@@ -50,7 +50,7 @@ to a different geographical location and, therefore, different network.  As a
 result, it is the virtual circuit, not the physical link, that represents a
 route and, therefore, a network interface in Linux terms.
 
-To further complicate things, virtual cuircits are usually volatile in nature
+To further complicate things, virtual circuits are usually volatile in nature
 (excluding so called `permanent' virtual circuits or PVCs).  With almost no
 time required to set up and tear down a virtual circuit, it is highly desirable
 to implement on-demand connections in order to minimize network charges.  So
@@ -59,7 +59,7 @@ network interfaces and cope as multiple virtual circuits come into existence
 and go away dynamically.
  
 Last, but not least, WAN configuration is much more complex than that of say
-ethernet and may well amount to several dozens of parameters.  Some of them
+Ethernet and may well amount to several dozens of parameters.  Some of them
 are "link-wide"  while others are virtual circuit-specific.  The same holds
 true for WAN statistics which is by far more extensive and extremely useful
 when troubleshooting WAN connections.  Extending the ifconfig utility to suit
@@ -71,9 +71,9 @@ Most of these problems are taken care of by this module.  Its goal is to
 provide a user with more-or-less standard look and feel for all WAN devices and
 assist a WAN device driver writer by providing common services, such as:
 
- o User-level interface via /proc filesystem
+ o User-level interface via /proc file system
  o Centralized configuration
- o Device managenent (setup, shutdown, etc.)
+ o Device management (setup, shutdown, etc.)
  o Network interface management (dynamic creation/destruction)
  o Protocol encapsulation/decapsulation
 
@@ -84,7 +84,7 @@ available from
 			or
 	ftp.sangoma.com/pub/linux/vX.Y.Z/wanpipe-X.Y.Z.tgz
 
-where vX.Y.Z represent the linux kernel version number.
+where vX.Y.Z represent the Linux kernel version number.
 
 For technical questions and/or comments regarding this product please e-mail
 to jaspreet@sangoma.com or dm@sangoma.com.
@@ -107,7 +107,7 @@ Ave, Cambridge, MA 02139, USA.
 
 
 
-ACKNOLEGEMENTS
+ACKNOWLEDGMENTS
 
 This product is based on the WANPIPE(tm) Multiprotocol WAN Router developed
 by Sangoma Technologies Inc. for Linux 1.2.x.  Release of Linux 2.0 in summer
@@ -173,7 +173,7 @@ REVISION HISTORY
 1.0.1	January 30, 1997
 
 			      -	Implemented user-readable status and statistics
-				via /proc filesystem
+				via /proc file system
 
 1.0.0	December 31, 1996
 
diff --git a/Documentation/networking/z8530drv.txt b/Documentation/networking/z8530drv.txt
index e2e5b5a13..cf7dc609b 100644
--- a/Documentation/networking/z8530drv.txt
+++ b/Documentation/networking/z8530drv.txt
@@ -254,7 +254,7 @@ speed 1200		# the default baudrate
 clock dpll		# clock source: 
 			# 	dpll     = normal halfduplex operation
 			# 	external = MODEM provides own Rx/Tx clock
-			#	divider  = use fullduplex divider if
+			#	divider  = use full duplex divider if
 			#		   installed (1)
 mode nrzi		# HDLC encoding mode
 			#	nrzi = 1k2 MODEM, G3RUH 9k6 MODEM
@@ -450,7 +450,7 @@ speed:
      Example: sccparam /dev/scc3 speed 9600
 
 txdelay:
-     The delay (in units of 10ms) after keying of the 
+     The delay (in units of 10 ms) after keying of the 
      transmitter, until the first byte is sent. This is usually 
      called "TXDELAY" in a TNC.  When 0 is specified, the driver 
      will just wait until the CTS signal is asserted. This 
@@ -472,7 +472,7 @@ persist:
 
 slottime:
      This is the time between samples of the channel. It is 
-     expressed in units of 10ms.  About 200-300 ms (value 20-30) 
+     expressed in units of 10 ms.  About 200-300 ms (value 20-30) 
      seems to be a good value.
 
      Example: sccparam /dev/scc0 slot 20
@@ -484,7 +484,7 @@ tail:
      SCC before the transmitter is keyed down. The value depends 
      on the baudrate selected.  A few character times should be 
      sufficient, e.g. 40ms at 1200 baud. (value 4)
-     The value of this parameter is in 10ms units.
+     The value of this parameter is in 10 ms units.
 
      Example: sccparam /dev/scc2 4
 
@@ -507,9 +507,9 @@ full:
 wait:
      The initial waittime before any transmit attempt, after the 
      frame has been queue for transmit.  This is the length of 
-     the first slot in CSMA mode.  In fullduplex modes it is
+     the first slot in CSMA mode.  In full duplex modes it is
      set to 0 for maximum performance.
-     The value of this parameter is in 10ms units. 
+     The value of this parameter is in 10 ms units. 
 
      Example: sccparam /dev/scc1 wait 4
 
@@ -534,7 +534,7 @@ min:
      Example: sccparam /dev/scc3 min 10
 
 idle
-     This parameter specifies the maximum idle time in fullduplex 
+     This parameter specifies the maximum idle time in full duplex 
      2 mode, in seconds.  When no frames have been sent for this 
      time, the transmitter will be keyed down.  A value of 0 is
      has same result as the fullduplex mode 1. This parameter