Merge with Linux 2.3.40.

2 files changed, 44 insertions, 51 deletions

diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index d7a8baf3f..09ae1d978 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -12,6 +12,8 @@
                 - Swansea University Computer Society DECnet Archive
                   (contains kernel patches and info)
                 - Mirror of userland tools on ftp.dreamtime.org
+                - Mirror of Alexey Kuznetsov's iproute2 package and
+                  other utilities
 
         ftp://ftp.dreamtime.org/pub/linux/decnet/
                 - Patrick Caulfield's archive of userland tools and
@@ -39,10 +41,16 @@ The kernel command line takes options looking like the following:
 
     decnet=1,2,1
 
-the first two numbers are the node address 1,2 = 1.2 (yes, you must use
-commas when specifying them). The third number is the level number for routers
-and is optional. It is probably a good idea to set the DECnet address on boot
-like this rather than trying to do it later.
+the first two numbers are the node address 1,2 = 1.2 For 2.2.xx kernels
+and early 2.3.xx kernels, you must use a comma when specifying the
+DECnet address like this. For more recent 2.3.xx kernels, you may
+use almost charecter except space, although a `.` would be the most
+obvious choice :-)
+
+The third number is the level number for routers and is optional. In fact
+this option may go away shortly in favour if settings for each interface
+seperately. It is probably a good idea to set the DECnet address and type
+on boot like this rather than trying to do it later.
 
 There are also equivalent options for modules. The node address and type can
 also be set through the /proc/sys/net/decnet/ files, as can other system
@@ -71,7 +79,23 @@ is available. Usually this will be eth0, for example:
 There is a list of what the other files under /proc/sys/net/decnet/ do
 on the kernel patch web site (shown above).
 
-4) How can I tell if its working ?
+4) Run time kernel configuration
+
+This is either done through the sysctl/proc interface (see the kernel web
+pages for details on what the various options do) or through the iproute2
+package in the same way as IPv4/6 configuration is performed.
+
+Documentation for iproute2 is included with the package, although there is
+as yet no specific section on DECnet, most of the features apply to both
+IP and DECnet, albeit with DECnet addresses instead of IP addresses and
+a reduced functionality.
+
+If you want to configure a DECnet router you'll need the iproute2 package
+since its the _only_ way to add and delete routes currently. Eventually
+there will be a routing daemon to send and receive routing messages for
+each interface and update the kernel routing tables accordingly.
+
+5) How can I tell if its working ?
 
 Here is a quick guide of what to look for in order to know if your DECnet
 kernel subsystem is working.
@@ -102,11 +126,11 @@ kernel subsystem is working.
      network, and see if you can obtain the same results.
    - At this point you are on your own... :-)
 
-5) How to send a bug report
+6) How to send a bug report
 
 If you've found a bug and want to report it, then there are several things
 you can do to help me work out exactly what it is that is wrong. Useful
-information (a lot of which is essential) includes:
+information (_most_ of which _is_ _essential_) includes:
 
  - What kernel version are you running ?
  - What version of the patch are you running ?
@@ -121,10 +145,10 @@ information (a lot of which is essential) includes:
  - How can the problem be reproduced ?
  - Can you use tcpdump to get a trace ? (N.B. Most (all?) versions of 
    tcpdump don't understand how to dump DECnet properly, so including
-   the hex listing of the packet contents is essential, usually the -x flag.
+   the hex listing of the packet contents is _essential_, usually the -x flag.
    You may also need to increase the length grabbed with the -s flag)
 
-6) Mailing list
+7) Mailing list
 
 If you are keen to get involved in development, or want to ask questions
 about configuration, or even just report bugs, then there is a mailing
@@ -134,7 +158,7 @@ subscribe linux-decnet
 
 as the body of the message.
 
-7) Legal Info
+8) Legal Info
 
 The Linux DECnet project team have placed their code under the GPL. The
 software is provided "as is" and without warranty express or implied.
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 614cf43b7..e432afc64 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -13,30 +13,10 @@ ip_forward - BOOLEAN
 ip_default_ttl - INTEGER
 	default 64
 
-ip_addrmask_agent - BOOLEAN
-	Reply to ICMP ADDRESS MASK requests.
-	default TRUE (router)
-		FALSE (host)
-
-ip_bootp_agent - BOOLEAN
-	Accept packets with source address of sort 0.b.c.d
-	and destined to this host, broadcast or multicast.
-	Such packets are silently ignored otherwise.
-
-	default FALSE
-
 ip_no_pmtu_disc - BOOLEAN
 	Disable Path MTU Discovery.
 	default FALSE
 
-ip_fib_model - INTEGER
-	0 - (DEFAULT) Standard model. All routes are in class MAIN.
-	1 - default routes go to class DEFAULT. This mode should
-	    be very convenient for small ISPs making policy routing.
-	2 - RFC1812 compliant model.
-	    Interface routes are in class MAIN.
-	    Gateway routes are in class DEFAULT.
-
 IP Fragmentation:
 
 ipfrag_high_thresh - INTEGER
@@ -187,18 +167,17 @@ proxy_arp - BOOLEAN
 	Do proxy arp.
 
 shared_media - BOOLEAN
-	undocumented.
+	Send(router) or accept(host) RFC1620 shared media redirects.
+	Overrides ip_secure_redirects.
+	default TRUE
 
 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...)
+send_redirects - BOOLEAN
+	Send redirects, if router. Default: TRUE
 
 bootp_relay - BOOLEAN
 	Accept packets with source address 0.b.c.d destined
@@ -213,27 +192,17 @@ accept_source_route - BOOLEAN
 	default TRUE (router)
 		FALSE (host)
 
-rp_filter - INTEGER
-	2 - do source validation by reversed path, as specified in RFC1812
+rp_filter - BOOLEAN
+	1 - 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.
+	Default value is 0. Note that some distribution enable it
+	in startip scripts.
 
 Alexey Kuznetsov.
 kuznet@ms2.inr.ac.ru
@@ -241,4 +210,4 @@ kuznet@ms2.inr.ac.ru
 Updated by:
 Andi Kleen
 ak@muc.de
-$Id: ip-sysctl.txt,v 1.10 2000/01/06 00:41:42 davem Exp $
+$Id: ip-sysctl.txt,v 1.11 2000/01/08 20:32:41 davem Exp $