1 files changed, 44 insertions, 47 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 691268f3a359..70491d9035eb 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -35,7 +35,7 @@ config IP_ADVANCED_ROUTER
 
           at boot time after the /proc file system has been mounted.
 
-          If you turn on IP forwarding, you will also get the rp_filter, which
+          If you turn on IP forwarding, you should consider the rp_filter, which
           automatically rejects incoming packets if the routing table entry
           for their source address doesn't match the network interface they're
           arriving on. This has security advantages because it prevents the
@@ -46,12 +46,16 @@ config IP_ADVANCED_ROUTER
           rp_filter on use:
 
           echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter
-          or
+           and
           echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter
 
+          Note that some distributions enable it in startup scripts.
+          For details about rp_filter strict and loose mode read
+          <file:Documentation/networking/ip-sysctl.txt>.
+
           If unsure, say N here.
 
-choice 
+choice
         prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)"
         depends on IP_ADVANCED_ROUTER
         default ASK_IP_FIB_HASH
@@ -59,27 +63,29 @@ choice
 config ASK_IP_FIB_HASH
         bool "FIB_HASH"
         ---help---
-        Current FIB is very proven and good enough for most users.
+          Current FIB is very proven and good enough for most users.
 
 config IP_FIB_TRIE
         bool "FIB_TRIE"
         ---help---
-        Use new experimental LC-trie as FIB lookup algorithm. 
-        This improves lookup performance if you have a large
-        number of routes.
-
-        LC-trie is a longest matching prefix lookup algorithm which
-        performs better than FIB_HASH for large routing tables.
-        But, it consumes more memory and is more complex.
-        
-        LC-trie is described in:
-        
-        IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson
-        IEEE Journal on Selected Areas in Communications, 17(6):1083-1092, June 1999
-        An experimental study of compression methods for dynamic tries
-        Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.
-        http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/
-       
+          Use new experimental LC-trie as FIB lookup algorithm.
+          This improves lookup performance if you have a large
+          number of routes.
+
+          LC-trie is a longest matching prefix lookup algorithm which
+          performs better than FIB_HASH for large routing tables.
+          But, it consumes more memory and is more complex.
+
+          LC-trie is described in:
+
+          IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson
+          IEEE Journal on Selected Areas in Communications, 17(6):1083-1092,
+          June 1999
+
+          An experimental study of compression methods for dynamic tries
+          Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.
+          http://www.nada.kth.se/~snilsson/public/papers/dyntrie2/
+
 endchoice
 
 config IP_FIB_HASH
@@ -191,7 +197,7 @@ config IP_PNP_RARP
           <file:Documentation/filesystems/nfsroot.txt> for details.
 
 # not yet ready..
-#   bool '    IP: ARP support' CONFIG_IP_PNP_ARP                
+#   bool '    IP: ARP support' CONFIG_IP_PNP_ARP
 config NET_IPIP
         tristate "IP: tunneling"
         select INET_TUNNEL
@@ -267,29 +273,20 @@ config IP_PIMSM_V2
           you want to play with it.
 
 config ARPD
-        bool "IP: ARP daemon support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "IP: ARP daemon support"
         ---help---
-          Normally, the kernel maintains an internal cache which maps IP
-          addresses to hardware addresses on the local network, so that
-          Ethernet/Token Ring/ etc. frames are sent to the proper address on
-          the physical networking layer. For small networks having a few
-          hundred directly connected hosts or less, keeping this address
-          resolution (ARP) cache inside the kernel works well. However,
-          maintaining an internal ARP cache does not work well for very large
-          switched networks, and will use a lot of kernel memory if TCP/IP
-          connections are made to many machines on the network.
-
-          If you say Y here, the kernel's internal ARP cache will never grow
-          to more than 256 entries (the oldest entries are expired in a LIFO
-          manner) and communication will be attempted with the user space ARP
-          daemon arpd. Arpd then answers the address resolution request either
-          from its own cache or by asking the net.
-
-          This code is experimental and also obsolete. If you want to use it,
-          you need to find a version of the daemon arpd on the net somewhere,
-          and you should also say Y to "Kernel/User network link driver",
-          below. If unsure, say N.
+          The kernel maintains an internal cache which maps IP addresses to
+          hardware addresses on the local network, so that Ethernet/Token Ring/
+          etc. frames are sent to the proper address on the physical networking
+          layer. Normally, kernel uses the ARP protocol to resolve these
+          mappings.
+
+          Saying Y here adds support to have an user space daemon to do this
+          resolution instead. This is useful for implementing an alternate
+          address resolution protocol (e.g. NHRP on mGRE tunnels) and also for
+          testing purposes.
+
+          If unsure, say N.
 
 config SYN_COOKIES
         bool "IP: TCP syncookie support (disabled per default)"
@@ -361,7 +358,7 @@ config INET_IPCOMP
         ---help---
           Support for IP Payload Compression Protocol (IPComp) (RFC3173),
           typically needed for IPsec.
-          
+
           If unsure, say Y.
 
 config INET_XFRM_TUNNEL
@@ -401,8 +398,8 @@ config INET_XFRM_MODE_BEET
           If unsure, say Y.
 
 config INET_LRO
-        tristate "Large Receive Offload (ipv4/tcp)"
-
+        bool "Large Receive Offload (ipv4/tcp)"
+        default y
         ---help---
           Support for Large Receive Offload (ipv4/tcp).
 
@@ -415,7 +412,7 @@ config INET_DIAG
           Support for INET (TCP, DCCP, etc) socket monitoring interface used by
           native Linux tools such as ss. ss is included in iproute2, currently
           downloadable at <http://linux-net.osdl.org/index.php/Iproute2>.
-          
+
           If unsure, say Y.
 
 config INET_TCP_DIAG