[SCSI] in2000: convert to accessors and !use_sg cleanup

[linux-2.6-omap-h63xx.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index e62aee0ec4c588c9373ba484ca79beee2e20996e..9f9fd2c6f6e27f2dabc5ced271040ca774a8a153 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -43,11 +43,11 @@ config IP_ADVANCED_ROUTER
          asymmetric routing (packets from you to a host take a different path
          than packets from that host to you) or if you operate a non-routing
          host which has several IP addresses on different interfaces. To turn
          asymmetric routing (packets from you to a host take a different path
          than packets from that host to you) or if you operate a non-routing
          host which has several IP addresses on different interfaces. To turn

-         rp_filter off use:
+         rp_filter on use:

 
 

-         echo 0 > /proc/sys/net/ipv4/conf/<device>/rp_filter
+         echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter

          or
          or

-         echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter
+         echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter

 
          If unsure, say N here.
 
 
          If unsure, say N here.
 


@@ -116,48 +116,6 @@ config IP_ROUTE_MULTIPATH
          equal "cost" and chooses one of them in a non-deterministic fashion
          if a matching packet arrives.
 
          equal "cost" and chooses one of them in a non-deterministic fashion
          if a matching packet arrives.
 

-config IP_ROUTE_MULTIPATH_CACHED
-       bool "IP: equal cost multipath with caching support (EXPERIMENTAL)"
-       depends on IP_ROUTE_MULTIPATH
-       help
-         Normally, equal cost multipath routing is not supported by the
-         routing cache. If you say Y here, alternative routes are cached
-         and on cache lookup a route is chosen in a configurable fashion.
-
-         If unsure, say N.
-
-config IP_ROUTE_MULTIPATH_RR
-       tristate "MULTIPATH: round robin algorithm"
-       depends on IP_ROUTE_MULTIPATH_CACHED
-       help
-         Mulitpath routes are chosen according to Round Robin
-
-config IP_ROUTE_MULTIPATH_RANDOM
-       tristate "MULTIPATH: random algorithm"
-       depends on IP_ROUTE_MULTIPATH_CACHED
-       help
-         Multipath routes are chosen in a random fashion. Actually,
-         there is no weight for a route. The advantage of this policy
-         is that it is implemented stateless and therefore introduces only
-         a very small delay.
-
-config IP_ROUTE_MULTIPATH_WRANDOM
-       tristate "MULTIPATH: weighted random algorithm"
-       depends on IP_ROUTE_MULTIPATH_CACHED
-       help
-         Multipath routes are chosen in a weighted random fashion. 
-         The per route weights are the weights visible via ip route 2. As the
-         corresponding state management introduces some overhead routing delay
-         is increased.
-
-config IP_ROUTE_MULTIPATH_DRR
-       tristate "MULTIPATH: interface round robin algorithm"
-       depends on IP_ROUTE_MULTIPATH_CACHED
-       help
-         Connections are distributed in a round robin fashion over the
-         available interfaces. This policy makes sense if the connections 
-         should be primarily distributed on interfaces and not on routes. 
-

 config IP_ROUTE_VERBOSE
        bool "IP: verbose route monitoring"
        depends on IP_ADVANCED_ROUTER
 config IP_ROUTE_VERBOSE
        bool "IP: verbose route monitoring"
        depends on IP_ADVANCED_ROUTER


@@ -436,6 +394,14 @@ config INET_XFRM_MODE_BEET
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config INET_LRO
+       tristate "Large Receive Offload (ipv4/tcp)"
+
+       ---help---
+         Support for Large Receive Offload (ipv4/tcp).
+
+         If unsure, say Y.
+

 config INET_DIAG
        tristate "INET: socket monitoring interface"
        default y
 config INET_DIAG
        tristate "INET: socket monitoring interface"
        default y


@@ -577,6 +543,7 @@ config TCP_CONG_VENO
 config TCP_CONG_YEAH
        tristate "YeAH TCP"
        depends on EXPERIMENTAL
 config TCP_CONG_YEAH
        tristate "YeAH TCP"
        depends on EXPERIMENTAL

+       select TCP_CONG_VEGAS

        default n
        ---help---
        YeAH-TCP is a sender-side high-speed enabled TCP congestion control
        default n
        ---help---
        YeAH-TCP is a sender-side high-speed enabled TCP congestion control


@@ -593,7 +560,7 @@ config TCP_CONG_ILLINOIS
        depends on EXPERIMENTAL
        default n
        ---help---
        depends on EXPERIMENTAL
        default n
        ---help---

-       TCP-Illinois is a sender-side modificatio of TCP Reno for
+       TCP-Illinois is a sender-side modification of TCP Reno for

        high speed long delay links. It uses round-trip-time to
        adjust the alpha and beta parameters to achieve a higher average
        throughput and maintain fairness.
        high speed long delay links. It uses round-trip-time to
        adjust the alpha and beta parameters to achieve a higher average
        throughput and maintain fairness.


@@ -651,7 +618,7 @@ config TCP_MD5SIG
        select CRYPTO
        select CRYPTO_MD5
        ---help---
        select CRYPTO
        select CRYPTO_MD5
        ---help---

-         RFC2385 specifices a method of giving MD5 protection to TCP sessions.
+         RFC2385 specifies a method of giving MD5 protection to TCP sessions.

          Its main (only?) use is to protect BGP sessions between core routers
          on the Internet.
 
          Its main (only?) use is to protect BGP sessions between core routers
          on the Internet.