Sync with Linux 2.1.46.

9 files changed, 173 insertions, 54 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 4e9e6678d..a9274b91a 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -287,17 +287,19 @@ CONFIG_BLK_DEV_RZ1000
   Linux.  This may slow disk throughput by a few percent, but at least
   things will operate 100% reliably. If unsure, say Y.
 
-Intel 82371 PIIX (Triton I/II) DMA support
+Intel 82371 PIIX (Triton I/II), VIA VP-1 DMA support
 CONFIG_BLK_DEV_TRITON
   If your PCI system uses an IDE harddrive (as opposed to SCSI, say)
   and includes the Intel Triton I/II IDE interface chipset (i82371FB,
-  i82371SB or i82371AB), you will want to enable this option to allow
-  use of bus-mastering DMA data transfers. Read the comments at the
+  i82371SB or i82371AB), or the VIA VP-1 IDE interface chipset 
+  (VT82C586), you will want to enable this option to allow use of 
+  bus-mastering DMA data transfers. Read the comments at the
   beginning of drivers/block/triton.c and Documentation/ide.txt.
   You can get the latest version of the hdparm utility via 
   ftp (user: anonymous) from
   sunsite.unc.edu/pub/Linux/kernel/patches/diskdrives/; it is
-  used to tune your harddisk. It is safe to say Y to this question.
+  used to tune your harddisk. 
+  It is safe to say Y to this question.
 
 Other IDE chipset support
 CONFIG_IDE_CHIPSETS
@@ -541,6 +543,19 @@ CONFIG_FIREWALL
   proxy server). Chances are that you should use this on every machine
   being run as a router and not on any regular host. If unsure, say N.
 
+SYN flood protection
+CONFIG_SYN_COOKIES
+  Normal TCP/IP networking is open to an attack known as SYN flooding.
+  This attack prevents legitimate users from being able to connect to
+  your computer and requires very little work for the attacker.
+  SYN cookies provide protection against this type of attack. With
+  this option turned on the TCP/IP stack will use a cryptographic
+  challenge protocol known as SYN cookies to enable legitimate users
+  to continue to connect, even when your machine is under attack.
+  Note that SYN cookies aren't enabled per default, you need to add
+  echo 1 >/proc/sys/net/ipv4/tcp_syncookies to one of your startup scripts
+  (e.g. /etc/rc.local or /etc/rc.d/rc.local).	
+
 Socket Security API Support (EXPERIMENTAL)
 CONFIG_NET_SECURITY
   Enable use of the socket security API. Note that Linux does not include
@@ -1331,7 +1346,7 @@ CONFIG_IPDDP
   networking available.  This feature is experimental. Please see
   http://www.maths.unm.edu/~bradford/ltpc.html for support software.
 
-LocalTalk PC card support
+Apple/Farallon LocalTalk PC card support
 CONFIG_LTPC
   This allows you to use the AppleTalk PC card to connect to LocalTalk
   networks.  The card is also known as the Farallon PhoneNet PC card.
@@ -1343,6 +1358,26 @@ CONFIG_LTPC
   See README.ltpc in the drivers/net directory, and the web site
   http://www.math.unm.edu/~bradford/ltpc.html
 
+COPS LocalTalk PC card support
+CONFIG_COPS
+  This allows you to use the COPS AppleTalk card to connect to LocalTalk
+  networks. You also need version 1.3.3 or later of the netatalk package.
+  This driver is experimental, which means that it may not work.
+  In particular the module support is not yet working for the 2.1.xx
+  kernels, so choose Y or N, but not M for now.
+  See the web site http://www.math.unm.edu/~bradford/ltpc.html for localtalk
+  IP tools.
+
+Dayna firmware support
+CONFIG_COPS_DAYNA
+  Support COPS compatible cards with Dayna style firmware (Dayna DL2000/
+  Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC III)
+
+Tangent firmware support
+CONFIG_COPS_TANGENT
+  Support COPS compatible cards with Tangent style firmware (Tangent ATB_II,
+  Novell NL-1000, Daystar Digital LT-200
+
 Amateur Radio AX.25 Level 2
 CONFIG_AX25
   This is the protocol used for computer communication over amateur
@@ -3280,6 +3315,14 @@ CONFIG_ETH16I
   Multiple-Ethernet-mini-HOWTO, available from
   sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini.
 
+TI ThunderLAN support (EXPERIMENTAL)
+CONFIG_TLAN
+  If you have a TLAN based network card which is supported by this
+  driver, say Y and read the Ethernet-HOWTO.  Devices currently supported
+  are the Compaq Netelligent 10, Netelligent 10/100, and Internal
+  NetFlex 3.  This driver is also available as a module.  Please email
+  feedback to james.banks@caldera.com.
+
 Zenith Z-Note support
 CONFIG_ZNET
   The Zenith Z-Note notebook computer has a built-in network
@@ -4357,6 +4400,12 @@ CONFIG_82C710_MOUSE
   doesn't work. Read the Busmouse-HOWTO, available via ftp (user:
   anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO.
 
+PC110 digitizer pad support
+CONFIG_PC110_PAD
+  This drives the digitizer pad on the IBM PC110 palmtop (see 
+  http://toy.cabi.net). It can turn the digitizer pad into a 
+  mouse emulation with tap gestures or into an absolute pad.
+
 Microsoft busmouse support
 CONFIG_MS_BUSMOUSE
   These animals (also called Inport mice) are connected to an
diff --git a/Documentation/binfmt_misc.txt b/Documentation/binfmt_misc.txt
index 81d49b2bc..aef3b271a 100644
--- a/Documentation/binfmt_misc.txt
+++ b/Documentation/binfmt_misc.txt
@@ -1,26 +1,26 @@
-	Kernel Support for miscellaneous (your favourite) Binary Formats v1.1
-	====================================================================
+     Kernel Support for miscellaneous (your favourite) Binary Formats v1.1
+     =====================================================================
 
 This Kernel feature allows to invoke almost (for restrictions see below) every
-program by simply typing it's name in the shell.
+program by simply typing its name in the shell.
 This includes for example compiled Java(TM), Python or Emacs programs.
 
-To achieve this you must tell binfmt_misc which interpreter has to be invoked with
-which binary. Binfmt_misc recognises the binary-type by matching some bytes at the
-beginning of the file with a magic byte sequence (masking out specified bits) you
-have supplied. Binfmt_misc can also recognise a filename extension (aka .com) and
-optionally strip it off.
+To achieve this you must tell binfmt_misc which interpreter has to be invoked
+with which binary. Binfmt_misc recognises the binary-type by matching some bytes
+at the beginning of the file with a magic byte sequence (masking out specified
+bits) you have supplied. Binfmt_misc can also recognise a filename extension
+(aka .com) and optionally strip it off.
 
 To actually register a new binary type, you have to set up a string looking like
-:name:type:offset:magic:mask:interpreter: (where you can choose the ':' upon your
-needs) and echo it to /proc/sys/fs/binfmt_misc/register.
+:name:type:offset:magic:mask:interpreter: (where you can choose the ':' upon
+your needs) and echo it to /proc/sys/fs/binfmt_misc/register.
 Here is what the fields mean:
  - 'name' is an identifier string. A new /proc file will be created with this
-   this name below /proc/sys/fs/binfmt_misc
+   name below /proc/sys/fs/binfmt_misc
  - 'type' is the type of recognition. Give 'M' for magic and 'E' for extension.
-   Give the corresponding lowercase letter to let binfmt_misc strip of the
+   Give the corresponding lowercase letter to let binfmt_misc strip off the
    filename extension.
- - 'offset' is the offset of the magic/mask in the file counted in bytes. This
+ - 'offset' is the offset of the magic/mask in the file, counted in bytes. This
    defaults to 0 if you omit it (i.e. you write ':name:type::magic...')
  - 'magic' is the byte sequence binfmt_misc is matching for. The magic string
    may contain hex-encoded characters like \x0a or \xA4. In a shell environment
@@ -28,33 +28,34 @@ Here is what the fields mean:
    If you chose filename extension matching, this is the extension to be
    recognised (the \x0a specials are not allowed). Extension matching is case
    sensitive!
- - 'mask' is an (optional, defaults to all 0xff) mask. You can mask out some bits
-   from matching by supplying a string like magic and as long as magic. The
-   mask is anded with the byte sequence of the file.
+ - 'mask' is an (optional, defaults to all 0xff) mask. You can mask out some
+   bits from matching by supplying a string like magic and as long as magic.
+   The mask is anded with the byte sequence of the file.
  - 'interpreter' is the program that should be invoked with the binary as first
    argument (specify the full path)
 There are some restrictions:
  - the whole register string may not exceed 255 characters
- - the magic must resist in the first 128 bytes of the file, i.e. offset+size(magic)
-   has to be less than 128
+ - the magic must resist in the first 128 bytes of the file, i.e.
+   offset+size(magic) has to be less than 128
  - the interpreter string may not exceed 127 characters
-You may want to add the binary formats in one of your /etc/rc scripts during boot-up.
-Read the manual of your init program to figure out how to do this right.
+You may want to add the binary formats in one of your /etc/rc scripts during
+boot-up. Read the manual of your init program to figure out how to do this
+right.
 
 
 A few examples (assumed you are in /proc/sys/fs/binfmt_misc):
 
-- enable Java(TM)-support (like binfmt_java):
-  echo ":Java:M::\xca\xfe\xba\xbe::/usr/local/bin/java:" > register
-  echo :Applet:M::\<\!--applet::/usr/local/bin/appletviewer: > register
 - enable support for em86 (like binfmt_em86, for Alpha AXP only):
   echo ":i386:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:" > register
   echo ":i486:M::\x7fELF\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/bin/em86:" > register
+
 - enable support for packed DOS applications (pre-configured dosemu hdimages):
   echo ":DEXE:M::\x0eDEX::/usr/bin/dosexec:" > register
+
 - enable support for DOS/Windows executables (using mzloader and dosemu/wine):
   echo ":DOSWin:M::MZ::/usr/sbin/mzloader:" > register
-  echo ":DOS:E::com::/usr/sbin/mzloader:" > register
+  echo ":DOScom:E::com::/usr/sbin/mzloader:" > register
+  echo ":DOSexe:E::exe::/usr/sbin/mzloader:" > register
 
 
 You can enable/disable binfmt_misc or one binary type by echoing 0 (to disable)
@@ -65,16 +66,34 @@ You can remove one entry or all entries by echoing -1 to /proc/.../the_name
 or /proc/sys/fs/binfmt_misc/status.
 
 
+Emulating binfmt_java:
+======================
+
+To emulate binfmt_java the following register-strings are necessary
+(the first two for byte-compiled Java binaries, the third for applets
+contained in a html-file). Register exactly in this order!
+  ":Java:M::\xca\xfe\xba\xbe::/usr/local/java/bin/java:"
+  ":JavaC:e::class::/usr/local/java/bin/java:"
+  ":Applet:E::html::/usr/local/java/bin/appletviewer:"
+
+To add a Java-executable to your path you can either make a symbolic
+link to the .class file elsewhere in your path (cut the .class-extension
+in the destination name for convenience) or add the directory of your
+.class files to your PATH environment. In both cases, ensure that the
+.class files are in your CLASSPATH environment!
+
+This is sort of ugly - Javas filename handling is just broken.
+
+
 HINTS:
 ======
 
-If your interpreter does not look at the PATH to determine the full name of the
-program, you need to invoke a wrapper-script (like the following for java) first:
+If you want to pass special arguments to your interpreter, you can
+write a wrapper script for it.
 
-#!/bin/sh
-FOO=`which $1` || exit 1
-shift
-/usr/local/bin/java $FOO ${1+$@}
+Your interpreter should NOT look in the PATH for the filename; the
+kernel passes it the full filename to use.  Using the PATH can cause
+unexpected behaviour and be a security hazard.
 
 
 There is a web page about binfmt_misc at
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 7d86d3168..790bb18c7 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -91,6 +91,7 @@ Code	Seq#	Include File		Comments
 					<mailto:natalia@nikhefk.nikhef.nl>
 'c'	all	linux/comstats.h
 'f'	all	linux/ext2_fs.h
+'k'	all	asm-sparc/kbio.h, asm-sparc64/kbio.h
 'l'	00-3F	linux/tcfs_fs.h		in development:
 					<http://mikonos.dia.unisa.it/tcfs>
 'm'	all	linux/mtio.h		conflict!
diff --git a/Documentation/m68k/amiboot.txt b/Documentation/m68k/amiboot.txt
index c119c6357..c6b369e28 100644
--- a/Documentation/m68k/amiboot.txt
+++ b/Documentation/m68k/amiboot.txt
@@ -1,9 +1,9 @@
 
-		Linux/m68k Amiga Bootstrap version 5.5
+		Linux/m68k Amiga Bootstrap version 5.6
 		--------------------------------------
 
 Maintained by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
-Last revised: March 27, 1997
+Last revised: June 12, 1997
 
 
 0. Introduction
@@ -22,7 +22,7 @@ and the Installation Guide
 first. Although the Installation Guide is getting a bit outdated, it's still a
 good starting point.
 
-Amiboot 5.5 is meant for Linux/m68k 2.0.x, 2.1.x or higher (kernel bootinfo
+Amiboot 5.6 is meant for Linux/m68k 2.0.x, 2.1.x or higher (kernel bootinfo
 interface versions 1.x and 2.x). Please use an older version for older kernels.
 
 
diff --git a/Documentation/networking/README.cops b/Documentation/networking/README.cops
new file mode 100644
index 000000000..7956fd213
--- /dev/null
+++ b/Documentation/networking/README.cops
@@ -0,0 +1,39 @@
+README for the COPS LocalTalk Linux driver (cops.c).
+	By Jay Schulist <Jay.Schulist@spacs.k12.wi.us>
+
+This driver compiles well against 2.1.29 - 2.1.41.
+
+Building the driver from the cops-0.0*.tar.gz file.
+1. Untar the cops-0.0*.tar.gz it will make a directory called cops.
+2. Copy the cops-kernel.diff to /usr/src/ and then type patch -p0 < cops-kernel.diff
+3. In the cops driver directory type make install. It will copy the driver to
+   the linux/drivers/net directory.
+4. When you configure your kernel select Y or M for COPS LocalTalk PC support.
+   Also make sure you have choosen Appletalk support.
+5. Compile like usual and you should bet set.
+
+This driver has 2 modes and they are: Dayna mode and Tangent mode.
+Each mode corresponds with the type of card. It has been found
+that there are 2 main types of cards and all other cards are
+the same and just have different names or only have minor differences
+such as more IO ports. As this driver is tested it will
+become more clear on exactly what cards are supported. The driver
+defaults to using Dayna mode. To change the drivers mode if you build
+a driver with dual support use board_type=1 or board_type=2 for
+dayna and tangent in the insmod.
+
+Operation/loading of the driver.
+Use modprobe like this:	/sbin/modprobe cops.o (IO #) (IRQ #)
+If you do not specify any options the driver will try and use the IO = 0x240,
+IRQ = 5. As of right now I would only use IRQ 5 for the card, if autoprobing.
+
+Use ifconfig like this: /sbin/ifconfig lt0 127.0.0.34 up
+
+You will need to configure atalkd with something like the following to make
+it work with the cops.c driver.
+
+dummy -seed -phase 2 -net 2000 -addr 2000.10 -zone "1033"
+lt0 -seed -phase 1 -net 1000 -addr 1000.50 -zone "1033"
+- Or -
+eth0 -seed -phase 2 -net 3000 -addr 3000.20 -zone "1033"
+lt0 -seed -phase 1 -net 1000 -addr 1000.50 -zone "1033"
diff --git a/Documentation/networking/ax25.txt b/Documentation/networking/ax25.txt
index 937b9efe6..7572cf733 100644
--- a/Documentation/networking/ax25.txt
+++ b/Documentation/networking/ax25.txt
@@ -1,6 +1,6 @@
 To use the amateur radio protocols within Linux you will need to get a
 suitable copy of the AX.25 Utilities. More detailed information about these
-and associated programs can be found on http://www.cs.nott.ac.uk/~jsn/.
+and associated programs can be found on http://zone.pspt.fi/~jsn/.
 
 For more information about the AX.25, NET/ROM and ROSE protocol stacks, see
 the AX25-HOWTO written by Terry Dawson <terry@perf.no.itg.telstra.com.au>
@@ -13,4 +13,4 @@ of the message, the subject field is ignored.
 
 Jonathan G4KLX
 
-jsn@cs.nott.ac.uk
+g4klx@g4klx.demon.co.uk
diff --git a/Documentation/networking/net-modules.txt b/Documentation/networking/net-modules.txt
index bdf5a34a1..f0f3ab470 100644
--- a/Documentation/networking/net-modules.txt
+++ b/Documentation/networking/net-modules.txt
@@ -159,6 +159,13 @@ atp.c: *Not modularized*
 	(Probes ports: 0x378, 0x278, 0x3BC;
 	 fixed IRQs: 5 and 7			)
 
+cops.c:
+	io = 0x240
+	irq = 5
+	nodeid = 0	(AutoSelect = 0, NodeID 1-254 is hand selected.)
+	(Probes ports: 0x240, 0x340, 0x200, 0x210, 0x220, 0x230, 0x260,
+		       0x2A0, 0x300, 0x310, 0x320, 0x330, 0x350, 0x360)	
+
 de4x5.c:
 	io = 0x000b
 	irq = 10
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index f95bc9f14..3062f43d5 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -1,10 +1,11 @@
 ------------------------------------------------------------------------------
 WAN Router for Linux Operating System
 ------------------------------------------------------------------------------
-Version 1.0.0
-December 31, 1996
-Author: Gene Kozin <genek@compuserve.com>
-Copyright (c) 1995-1996 Sangoma Technologies Inc.
+Version 1.0.3 - June 3, 1997
+Version 1.0.1 - January 30, 1997
+Author: Jaspreet Singh <jaspreet@sangoma.com>
+	Gene Kozin <genek@compuserve.com>
+Copyright (c) 1995-1997 Sangoma Technologies Inc.
 ------------------------------------------------------------------------------
 
 INTRODUCTION
@@ -95,12 +96,6 @@ Ave, Cambridge, MA 02139, USA.
 
 
 
-KNOWN BUGS AND LIMITATIONS
-
-/proc user interface is not complete yet.
-
-
-
 ACKNOLEGEMENTS
 
 This product is based on the WANPIPE(tm) Multiprotocol WAN Router developed
@@ -122,9 +117,19 @@ product.
 
 
 REVISION HISTORY
+1.0.3	June 3, 1997
+	o UDP port for multiple boards (Frame relay, PPP)
+	o Continuous Transmission of Configure Request Packet for PPP (this
+	  support is only added for 508 cards)
+	o Connection Timeout for PPP changed from 900 to 0
+	o Flow Control for multiple boards and multiple channels (Frame Relay)
+
+1.0.1	January 30, 1997
+
+	o Implemented user-readable status and statistics via /proc filesystem
+
+1.0.0	December 31, 1996
 
-1.0.0	 December 31, 1996
---------------------------
- o Initial version.
+	o Initial version
 
 >>>>>> END <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
diff --git a/Documentation/networking/x25.txt b/Documentation/networking/x25.txt
index 09681d565..67f17e644 100644
--- a/Documentation/networking/x25.txt
+++ b/Documentation/networking/x25.txt
@@ -41,5 +41,4 @@ The contents of the Subject line are ignored.
 
 Jonathan
 
-jsn@cs.nott.ac.uk
 g4klx@g4klx.demon.co.uk