Merge with 2.3.19.

12 files changed, 310 insertions, 121 deletions

diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index e3981efff..be39d93e4 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -13,9 +13,9 @@ PLIP.txt
 alias.txt
 	- info on using alias network devices 
 arcnet-hardware.txt
-	- tons of info on arcnet, hubs, arcnet card jumper settings, etc.
+	- tons of info on ARCnet, hubs, jumper settings for ARCnet cards, etc.
 arcnet.txt
-	- info on the using the arcnet driver itself.
+	- info on the using the ARCnet driver itself.
 ax25.txt
 	- info on using AX.25 and NET/ROM code for Linux
 baycom.txt
@@ -69,13 +69,13 @@ shaper.txt
 smc9.txt
 	- the driver for SMC's 9000 series of Ethernet cards
 soundmodem.txt
-	- Linux driver for soundcards as AX.25 modems
+	- Linux driver for sound cards as AX.25 modems
 tcp.txt
 	- short blurb on how TCP output takes place.
 tulip.txt
 	- 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.
+	- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.
 wan-router.txt
 	- Wan router documentation
 wanpipe.txt
diff --git a/Documentation/networking/Configurable b/Documentation/networking/Configurable
index 62c27457e..a941ca30f 100644
--- a/Documentation/networking/Configurable
+++ b/Documentation/networking/Configurable
@@ -20,11 +20,11 @@ to Address Resolution Protocol (ARP) are very easily viewed and altered.
 	7000
 
 Others are already accessible via the related user space programs.
-For example, MAX_WINDOW has a default of 32k which is a good choice for
-modern hardware, but if you have a slow (8 bit) ethercard and/or a slow
+For example, MAX_WINDOW has a default of 32 k which is a good choice for
+modern hardware, but if you have a slow (8 bit) Ethernet card and/or a slow
 machine, then this will be far too big for the card to keep up with fast 
-Tx'ing machines on the same net, resulting in overruns and receive errors.
-A value of about 4k would be more appropriate, which can be set via:
+machines transmitting on the same net, resulting in overruns and receive errors.
+A value of about 4 k would be more appropriate, which can be set via:
 
 	# route add -net 192.168.3.0 window 4096
 
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
index 9dafab262..efbf441ba 100644
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
@@ -18,8 +18,8 @@ Released 1994-06-13
 	pocket adapters, for the parallel port on a Linux based machine.
 	Some adapter "clones" will also work.  Xircom is _not_ a clone...
 	These drivers _can_ be used as loadable modules,
-	and were developed for use on Linux v1.1.13 and above.
-	For use on Linux v1.0.X, or earlier releases, see below.
+	and were developed for use on Linux 1.1.13 and above.
+	For use on Linux 1.0.X, or earlier releases, see below.
 
 	I have used these drivers for NFS, ftp, telnet and X-clients on
 	remote machines. Transmissions with ftp seems to work as
@@ -57,7 +57,7 @@ Released 1994-06-13
 	de620.h       Macros for de620.c
 
 	If you are upgrading from the d-link tar release, there will
-	also be a "dlink-patches" file that will patch Linux v1.1.18:
+	also be a "dlink-patches" file that will patch Linux 1.1.18:
 		linux/drivers/net/Makefile
 		linux/drivers/net/CONFIG
 		linux/drivers/net/MODULES
@@ -162,10 +162,10 @@ Released 1994-06-13
 
 	6. USING THE DRIVERS WITH EARLIER RELEASES.
 
-	The later v1.1.X releases of the Linux kernel include some
+	The later 1.1.X releases of the Linux kernel include some
 	changes in the networking layer (a.k.a. NET3). This affects
 	these drivers in a few places.  The hints that follow are
-	_not_ tested by me, since I don't have the diskspace to keep
+	_not_ tested by me, since I don't have the disk space to keep
 	all releases on-line.
 	Known needed changes to date:
 	- release patchfile: some patches will fail, but they should
diff --git a/Documentation/networking/PLIP.txt b/Documentation/networking/PLIP.txt
index b3539f5f9..ad7e3f7c3 100644
--- a/Documentation/networking/PLIP.txt
+++ b/Documentation/networking/PLIP.txt
@@ -49,17 +49,69 @@ an existing Ethernet. Isn't standard (not even de facto standard, like
 SLIP).
 
 Performance
-==========
+===========
 
 PLIP easily outperforms Ethernet cards....(ups, I was dreaming, but
 it *is* getting late. EOB)
 
+PLIP driver details
+-------------------
+
+The Linux PLIP driver is an implementation of the original Crynwr protocol,
+that uses the parallel port subsystem of the kernel in order to properly
+share parallel ports between PLIP and other services.
+
+IRQs and trigger timeouts
+=========================
+
+When a parallel port used for a PLIP driver has an IRQ configured to it, the
+PLIP driver is signaled whenever data is sent to it via the cable, such that
+when no data is available, the driver isn't being used.
+
+However, on some machines it is hard, if not impossible, to configure an IRQ
+to a certain parallel port, mainly because it is used by some other device.
+On these machines, the PLIP driver can be used in IRQ-less mode, where
+the PLIP driver would constantly poll the parallel port for data waiting,
+and if such data is available, process it. This mode is less efficient than
+the IRQ mode, because the driver has to check the parallel port many times
+per second, even when no data at all is sent. Some rough measurements
+indicate that there isn't a noticeable performance drop when using IRQ-less
+mode as compared to IRQ mode as far as the data transfer speed is involved.
+There is a performance drop on the machine hosting the driver.
+
+When the PLIP driver is used in IRQ mode, the timeout used for triggering a
+data transfer (the maximal time the PLIP driver would allow the other side
+before announcing a timeout, when trying to handshake a transfer of some
+data) is, by default, 500usec. As IRQ delivery is more or less immediate,
+this timeout is quite sufficient. 
+
+When in IRQ-less mode, the PLIP driver polls the parallel port HZ times
+per second (where HZ is typically 100 on most platforms, and 1024 on an
+Alpha, as of this writing). Between two such polls, there are 10^6/HZ usecs.
+On an i386, for example, 10^6/100 = 10000usec. It is easy to see that it is
+quite possible for the trigger timeout to expire between two such polls, as
+the timeout is only 500usec long. As a result, it is required to change the
+trigger timeout on the *other* side of a PLIP connection, to about
+10^6/HZ usecs. If both sides of a PLIP connection are used in IRQ-less mode,
+this timeout is required on both sides.
+
+It appears that in practice, the trigger timeout can be shorter than in the
+above calculation. It isn't an important issue, unless the wire is faulty,
+in which case a long timeout would stall the machine when, for whatever
+reason, bits are dropped.
+
+A utility that can perform this change in Linux is plipconfig, which is part
+of the net-tools package (its location can be found in the
+Documentation/Changes file). An example command would be
+'plipconfig plipX trigger 10000', where plipX is the appropriate
+PLIP device.
+
 PLIP hardware interconnection
 -----------------------------
 
 PLIP uses several different data transfer methods.  The first (and the
 only one implemented in the early version of the code) uses a standard
-printer "null" cable to transfers data four bits at a time using
+printer "null" cable to transfer data four bits at a time using
 data bit outputs connected to status bit inputs.
 
 The second data transfer method relies on both machines having
@@ -138,18 +190,18 @@ PLIP Mode 0 transfer protocol
 The PLIP driver is compatible with the "Crynwr" parallel port transfer
 standard in Mode 0.  That standard specifies the following protocol:
 
-   send header nibble '8'
+   send header nibble '0x8'
    count-low octet
    count-high octet
    ... data octets
    checksum octet
 
 Each octet is sent as
-	<wait for rx. '1'>	<send 0x10+(octet&0x0F)>
-	<wait for rx. '0'>	<send 0x00+((octet>>4)&0x0F)>
+	<wait for rx. '0x1?'>	<send 0x10+(octet&0x0F)>
+	<wait for rx. '0x0?'>	<send 0x00+((octet>>4)&0x0F)>
 
 To start a transfer the transmitting machine outputs a nibble 0x08.
-The raises the ACK line, triggering an interrupt in the receiving
+That raises the ACK line, triggering an interrupt in the receiving
 machine.  The receiving machine disables interrupts and raises its own ACK
 line. 
 
diff --git a/Documentation/networking/README.sb1000 b/Documentation/networking/README.sb1000
new file mode 100644
index 000000000..37c39a0c8
--- /dev/null
+++ b/Documentation/networking/README.sb1000
@@ -0,0 +1,207 @@
+sb1000 is a module network device driver for the General Instrument (also known
+as NextLevel) SURFboard1000 internal cable modem board.  This is an ISA card
+which is used by a number of cable TV companies to provide cable modem access.
+It's a one-way downstream-only cable modem, meaning that your upstream net link
+is provided by your regular phone modem.
+
+This driver was written by Franco Venturi <fventuri@mediaone.net>.  He deserves
+a great deal of thanks for this wonderful piece of code!
+
+-----------------------------------------------------------------------------
+
+Support for this device is now a part of the standard Linux kernel.  The
+driver source code file is drivers/net/sb1000.c.  In addition to this
+you will need:
+
+1.) The "cmconfig" program.  This is a utility which supplements "ifconfig"
+to configure the cable modem and network interface (usually called "cm0");
+and
+
+2.) Several PPP scripts which live in /etc/ppp to make connecting via your
+cable modem easy.
+
+   These utilities can be obtained from:
+
+      http://www.jacksonville.net/~fventuri/
+
+   in Franco's original source code distribution .tar.gz file.  Support for
+   the sb1000 driver can be found at:
+
+      http://home.adelphia.net/~siglercm/sb1000.html
+      http://linuxpower.cx/~cable/
+
+   along with these utilties.
+
+3.) The standard isapnp tools.  These are necessary to configure your SB1000
+card at boot time (or afterwards by hand) since it's a PnP card.
+
+   If you don't have these installed as a standard part of your Linux
+   distribution, you can find them at:
+
+      http://www.roestock.demon.co.uk/isapnptools/
+
+   or check your Linux distribution binary CD or their web site.  For help with
+   isapnp, pnpdump, or /etc/isapnp.conf, go to:
+
+      http://www.roestock.demon.co.uk/isapnptools/isapnpfaq.html
+
+-----------------------------------------------------------------------------
+
+To make the SB1000 card work, follow these steps:
+
+1.) Run `make config', or `make menuconfig', or `make xconfig', whichever
+you prefer, in the top kernel tree directory to set up your kernel
+configuration.  Make sure to say "Y" to "Prompt for development drivers"
+and to say "M" to the sb1000 driver.  Also say "Y" or "M" to all the standard
+networking questions to get TCP/IP and PPP networking support.
+
+2.) *BEFORE* you build the kernel, edit drivers/net/sb1000.c.  Make sure
+to redefine the value of READ_DATA_PORT to match the I/O address used
+by isapnp to access your PnP cards.  This is the value of READPORT in
+/etc/isapnp.conf or given by the output of pnpdump.
+
+3.) Build and install the kernel and modules as usual.
+
+4.) Boot your new kernel following the usual procedures.
+
+5.) Set up to configure the new SB1000 PnP card by capturing the output
+of "pnpdump" to a file and editing this file to set the correct I/O ports,
+IRQ, and DMA settings for all your PnP cards.  Make sure none of the settings
+conflict with one another.  Then test this configuration by running the
+"isapnp" command with your new config file as the input.  Check for
+errors and fix as necessary.  (As an aside, I use I/O ports 0x110 and
+0x310 and IRQ 11 for my SB1000 card and these work well for me.  YMMV.)
+Then save the finished config file as /etc/isapnp.conf for proper configuration
+on subsequent reboots.
+
+6.) Download the original file sb1000-1.1.2.tar.gz from Franco's site or one of
+the others referenced above.  As root, unpack it into a temporary directory and
+do a `make cmconfig' and then `install -c cmconfig /usr/local/sbin'.  Don't do
+`make install' because it expects to find all the utilities built and ready for
+installation, not just cmconfig.
+
+7.) As root, copy all the files under the ppp/ subdirectory in Franco's
+tar file into /etc/ppp, being careful not to overwrite any files that are
+already in there.  Then modify ppp@gi-on to set the correct login name,
+phone number, and frequency for the cable modem.  Also edit pap-secrets
+to specify your login name and password and any site-specific information
+you need.
+
+8.) Be sure to modify /etc/ppp/firewall to use ipchains instead of
+the older ipfwadm commands from the 2.0.x kernels.  There's a neat utility to
+convert ipfwadm commands to ipchains commands:
+
+   http://users.dhp.com/~whisper/ipfwadm2ipchains/
+
+You may also wish to modify the firewall script to implement a different
+firewalling scheme.
+
+9.) Start the PPP connection via the script /etc/ppp/ppp@gi-on.  You must be
+root to do this.  It's better to use a utility like sudo to execute
+frequently used commands like this with root permissions if possible.  If you
+connect successfully the cable modem interface will come up and you'll see a
+driver message like this at the console:
+
+         cm0: sb1000 at (0x110,0x310), csn 1, S/N 0x2a0d16d8, IRQ 11.
+         sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)
+
+The "ifconfig" command should show two new interfaces, ppp0 and cm0.
+The command "cmconfig cm0" will give you information about the cable modem
+interface.
+
+10.) Try pinging a site via `ping -c 5 www.yahoo.com', for example.  You should
+see packets received.
+
+11.) If you can't get site names (like www.yahoo.com) to resolve into
+IP addresses (like 204.71.200.67), be sure your /etc/resolv.conf file
+has no syntax errors and has the right nameserver IP addresses in it.
+If this doesn't help, try something like `ping -c 5 204.71.200.67' to
+see if the networking is running but the DNS resolution is where the
+problem lies.
+
+12.) If you still have problems, go to the support web sites mentioned above
+and read the information and documentation there.
+
+-----------------------------------------------------------------------------
+
+Common problems:
+
+1.) Packets go out on the ppp0 interface but don't come back on the cm0
+interface.  It looks like I'm connected but I can't even ping any
+numerical IP addresses.  (This happens predominantly on Debian systems due
+to a default boot-time configuration script.)
+
+Solution -- As root `echo 0 > /proc/sys/net/ipv4/conf/cm0/rp_filter' so it
+can share the same IP address as the ppp0 interface.  Note that this
+command should probably be added to the /etc/ppp/cablemodem script
+*right*between* the "/sbin/ifconfig" and "/sbin/cmconfig" commands.
+You may need to do this to /proc/sys/net/ipv4/conf/ppp0/rp_filter as well.
+If you do this to /proc/sys/net/ipv4/conf/default/rp_filter on each reboot
+(in rc.local or some such) then any interfaces can share the same IP
+addresses.
+
+2.) I get "unresolved symbol" error messages on executing `insmod sb1000.o'.
+
+Solution -- You probably have a non-matching kernel source tree and
+/usr/include/linux and /usr/include/asm header files.  Make sure you
+install the correct versions of the header files in these two directories.
+Then rebuild and reinstall the kernel.
+
+3.) When isapnp runs it reports an error, and my SB1000 card isn't working.
+
+Solution -- There's a problem with later versions of isapnp using the "(CHECK)"
+option in the lines that allocate the two I/O addresses for the SB1000 card.
+This first popped up on RH 6.0.  Delete "(CHECK)" for the SB1000 I/O addresses.
+Make sure they don't conflict with any other pieces of hardware first!  Then
+rerun isapnp and go from there.
+
+4.) I can't execute the /etc/ppp/ppp@gi-on file.
+
+Solution -- As root do `chmod ug+x /etc/ppp/ppp@gi-on'.
+
+5.) The firewall script isn't working (with 2.2.x and higher kernels).
+
+Solution -- Use the ipfwadm2ipchains script referenced above to convert the
+/etc/ppp/firewall script from the deprecated ipfwadm commands to ipchains.
+
+6.) I'm getting *tons* of firewall deny messages in the /var/kern.log,
+/var/messages, and/or /var/syslog files, and they're filling up my /var
+partition!!!
+
+Solution -- First, tell your ISP that you're receiving DoS (Denial of Service)
+and/or portscanning (UDP connection attempts) attacks!  Look over the deny
+messages to figure out what the attack is and where it's coming from.  Next,
+edit /etc/ppp/cablemodem and make sure the ",nobroadcast" option is turned on
+to the "cmconfig" command (uncomment that line).  If you're not receiving these
+denied packets on your broadcast interface (IP address xxx.yyy.zzz.255
+typically), then someone is attacking your machine in particular.  Be careful
+out there....
+
+7.) Everything seems to work fine but my computer locks up after a while
+(and typically during a lengthy download through the cable modem)!
+
+Solution -- You may need to add a short delay in the driver to 'slow down' the
+SURFboard because your PC might not be able to keep up with the transfer rate
+of the SB1000. To do this, it's probably best to download Franco's
+sb1000-1.1.2.tar.gz archive and build and install sb1000.o manually.  You'll
+want to edit the 'Makefile' and look for the 'SB1000_DELAY'
+define.  Uncomment those 'CFLAGS' lines (and comment out the default ones)
+and try setting the delay to something like 60 microseconds with:
+'-DSB1000_DELAY=60'.  Then do `make' and as root `make install' and try
+it out.  If it still doesn't work or you like playing with the driver, you may
+try other numbers.  Remember though that the higher the delay, the slower the
+driver (which slows down the rest of the PC too when it is actively
+used). Thanks to Ed Daiga for this tip!
+
+-----------------------------------------------------------------------------
+
+Credits:  This README came from Franco Venturi's original README file which is
+still supplied with his driver .tar.gz archive.  I and all other sb1000 users
+owe Franco a tremendous "Thank you!"  Additional thanks goes to Carl Patten
+and Ralph Bonnell who are now managing the Linux SB1000 web site, and to
+the SB1000 users who reported and helped debug the common problems listed
+above.
+
+
+					Clemmitt Sigler
+					csigler@vt.edu
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 1da37d5ce..f26fad498 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -323,20 +323,20 @@ endif
 
 d.) In /linux/drivers/net/Space.c file, add the line:
 
-extern int cs89x0_probe(struct device *dev);
+extern int cs89x0_probe(struct net_device *dev);
 
 
 Example:
 
- extern int ultra_probe(struct device *dev);
- extern int wd_probe(struct device *dev);
- extern int el2_probe(struct device *dev);
+ extern int ultra_probe(struct net_device *dev);
+ extern int wd_probe(struct net_device *dev);
+ extern int el2_probe(struct net_device *dev);
 
- extern int cs89x0_probe(struct device *dev);
+ extern int cs89x0_probe(struct net_device *dev);
 
- extern int ne_probe(struct device *dev);
- extern int hp_probe(struct device *dev);
- extern int hp_plus_probe(struct device *dev);
+ extern int ne_probe(struct net_device *dev);
+ extern int hp_probe(struct net_device *dev);
+ extern int hp_plus_probe(struct net_device *dev);
 
 
 Also add:
diff --git a/Documentation/networking/dgrs.txt b/Documentation/networking/dgrs.txt
index d37d1c41a..1aa1bb3f9 100644
--- a/Documentation/networking/dgrs.txt
+++ b/Documentation/networking/dgrs.txt
@@ -1,4 +1,4 @@
-	The Digi Intl. RightSwitch SE-X (dgrs) Device Driver
+    The Digi International 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
diff --git a/Documentation/networking/ip_masq/ip_masq-API-ex.c b/Documentation/networking/ip_masq/ip_masq-API-ex.c
deleted file mode 100644
index 4b6999d55..000000000
--- a/Documentation/networking/ip_masq/ip_masq-API-ex.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-   There is only 1 optname (see setsockopt(2)), IP_FW_MASQ_CTL that
-   must be used.
-   Funcionality depends on your kernel CONFIG options, here is
-   an example you can use to create an ``incoming'' tunnel:
-
-   See "user.c" module under ipmasqadm tree for a generic example
- */
-#undef __KERNEL__	/* Makefile lazyness ;) */
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
-
-#include <asm/types.h>          /* For __uXX types */
-#include <net/if.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
-#include <linux/ip_fw.h>        /* For IP_FW_MASQ_CTL */
-#include <linux/ip_masq.h>      /* For specific masq defs */
-
-
-int create_listening_masq(struct ip_masq_ctl *masq, int proto, u_int32_t src_addr, u_int16_t src_port, u_int32_t dst_addr)
-{
-	int sockfd;
-
-	sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-
-	if (sockfd<0) {
-		perror("socket(RAW)");
-		return -1;
-	}
-
-	memset (masq, 0, sizeof (*masq));
-
-	/*
-	 *	Want user tunnel control
-	 */
-	masq->m_target = IP_MASQ_TARGET_USER;
-
-	/*
-	 *	Want to insert new
-	 */
-	masq->m_cmd    = IP_MASQ_CMD_INSERT;
-
-	masq->u.user.protocol	= proto;
-	masq->u.user.saddr	= src_addr;
-	masq->u.user.sport	= src_port;
-	masq->u.user.rt_daddr	= inet_addr("192.168.21.239"); 
-
-	if (setsockopt(sockfd, IPPROTO_IP, 
-				IP_FW_MASQ_CTL, (char *)masq, sizeof(*masq)))    {
-		perror("setsockopt()");
-		return -1;
-	}
-	/* masq struct now contains tunnel details */
-	fprintf(stderr, "PROTO=%d SRC=0x%X:%x - MASQ=0x%X:%x - DST=0x%X:%x\n",
-			masq->u.user.protocol,
-			ntohl(masq->u.user.saddr), ntohs(masq->u.user.sport),
-			ntohl(masq->u.user.maddr), ntohs(masq->u.user.mport),
-			ntohl(masq->u.user.daddr), ntohs(masq->u.user.dport));
-	return 0;
-}
-
-int main(void) {
-	struct ip_masq_ctl masq_buf;
-
-	return create_listening_masq(&masq_buf,
-			IPPROTO_TCP, 
-			inet_addr("192.168.1.4"), 
-			htons(23),
-			inet_addr("192.168.21.3"));
-}
-
diff --git a/Documentation/networking/irda.txt b/Documentation/networking/irda.txt
index 1a49505e1..fa455100e 100644
--- a/Documentation/networking/irda.txt
+++ b/Documentation/networking/irda.txt
@@ -1,13 +1,14 @@
 To use the IrDA protocols within Linux you will need to get a suitable copy
 of the IrDA Utilities. More detailed information about these and associated
-programs can be found on http://www.cs.uit.no/~dagb/irda/.
+programs can be found on http://www.cs.uit.no/linux-irda/
 
-For more information about the IrDA protocol stack, see the IR-HOWTO
-written by Werner Heuser <r2d2c3po@zedat.fu-berlin.de>
+For more information about how to use the IrDA protocol stack, see the
+IR-HOWTO (http://www.snafu.de/~wehe/IR-HOWTO.html) written by Werner Heuser
+<wehe@snafu.de>
 
-There is an active mailing list for discussing Linux IrDA matters called
-linux-irda. To subscribe to it, send a message to Majordomo@list.uit.no
-with the words "subscribe linux-irda" in the body of the message, the
-subject field is ignored.
+There is an active mailing list for discussing Linux-IrDA matters called
+linux-irda. To subscribe to it, visit:
+
+	http://www.pasta.cs.uit.no/mailman/listinfo/linux-irda
 
 Dag Brattli <dagb@cs.uit.no>
diff --git a/Documentation/networking/multicast.txt b/Documentation/networking/multicast.txt
index 2bd6fd9ba..d426f36db 100644
--- a/Documentation/networking/multicast.txt
+++ b/Documentation/networking/multicast.txt
@@ -1,11 +1,13 @@
-Behaviour of cards under Multicast. This is how they currently 
-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.
+Behaviour of Cards Under Multicast
+==================================
 
-The following multicast requirements are needed
+This is how they currently behave, not what the hardware can do--for example,
+the Lance driver doesn't use its filter, even though the code for loading
+it is in the DEC Lance-based driver.
+
+The following are requirements for multicasting 
 -----------------------------------------------
-Appletalk	Multicast	hardware filtering not important but
+AppleTalk	Multicast	hardware filtering not important but
 				 avoid cards only doing promisc
 IP-Multicast	Multicast	hardware filters really help
 IP-MRoute	AllMulti	hardware filters are of no help
diff --git a/Documentation/networking/soundmodem.txt b/Documentation/networking/soundmodem.txt
index 47d1dfc3c..202101d18 100644
--- a/Documentation/networking/soundmodem.txt
+++ b/Documentation/networking/soundmodem.txt
@@ -42,8 +42,8 @@ driver from the insmod command line (or by means of an option line in
 /etc/conf.modules).
 
 Examples:
-  insmod soundmodem hw=0 mode=0 iobase=0x220 irq=5 dma=1
-  sethdlc -i sm0 -p hw sbc type afsk1200 io 0x220 irq 5 dma 1
+  insmod soundmodem mode="sbc:afsk1200" iobase=0x220 irq=5 dma=1
+  sethdlc -i sm0 -p mode "sbc:afsk1200" io 0x220 irq 5 dma 1
 
 Both lines configure the first port to drive a soundblaster card
 in 1200 baud AFSK mode.
diff --git a/Documentation/networking/wavelan.txt b/Documentation/networking/wavelan.txt
index 77351b4e7..a4a1f7921 100644
--- a/Documentation/networking/wavelan.txt
+++ b/Documentation/networking/wavelan.txt
@@ -1,7 +1,11 @@
 Sun Jul  2 01:38:33 EST 1995
 
-See also: http://www-uk.hpl.hp.com/people/jt/Linux/Wavelan.html
+	As the date above certify, this ``readme'' is mostly
+obsolete. Please read release notes and change list in
+driver/net/wavelan.p.h, and consult my web page at :
+	http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
 
+	Jean <jt@hpl.hp.com>
 
 1. At present the driver autoprobes for a WaveLAN card only at I/O address 
    0x390. The version of the card that I use (NCR) supports four I/O addresses