UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 6851464..7284062 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -32,7 +32,7 @@ config WANT_COMPAT_NETLINK_MESSAGES
 config COMPAT_NETLINK_MESSAGES
        def_bool y
        depends on COMPAT
-       depends on WIRELESS_EXT || WANT_COMPAT_NETLINK_MESSAGES
+       depends on WEXT_CORE || WANT_COMPAT_NETLINK_MESSAGES
        help
          This option makes it possible to send different netlink messages
          to tasks depending on whether the task is a compat task or not. To
@@ -86,6 +86,16 @@ config NETWORK_SECMARK
          to nfmark, but designated for security purposes.
          If you are unsure how to answer this question, answer N.
 
+config NETWORK_PHY_TIMESTAMPING
+       bool "Timestamping in PHY devices"
+       depends on EXPERIMENTAL
+       help
+         This allows timestamping of network packets by PHYs with
+         hardware timestamping capabilities. This option adds some
+         overhead in the transmit and receive paths.
+
+         If you are unsure how to answer this question, answer N.
+
 menuconfig NETFILTER
        bool "Network packet filtering framework (Netfilter)"
        ---help---
@@ -186,6 +196,7 @@ source "net/sctp/Kconfig"
 source "net/rds/Kconfig"
 source "net/tipc/Kconfig"
 source "net/atm/Kconfig"
+source "net/l2tp/Kconfig"
 source "net/802/Kconfig"
 source "net/bridge/Kconfig"
 source "net/dsa/Kconfig"
@@ -202,10 +213,17 @@ source "net/phonet/Kconfig"
 source "net/ieee802154/Kconfig"
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
+source "net/dns_resolver/Kconfig"
+source "net/batman-adv/Kconfig"
 
 config RPS
        boolean
-       depends on SMP && SYSFS
+       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
+       default y
+
+config XPS
+       boolean
+       depends on SMP && SYSFS && USE_GENERIC_SMP_HELPERS
        default y
 
 menu "Network testing"
@@ -235,7 +253,9 @@ config NET_TCPPROBE
        what was just said, you don't need it: say N.
 
        Documentation on how to use TCP connection probing can be found
-       at http://linux-net.osdl.org/index.php/TcpProbe
+       at:
+       
+         http://www.linuxfoundation.org/collaborate/workgroups/networking/tcpprobe
 
        To compile this code as a module, choose M here: the
        module will be called tcp_probe.
@@ -280,5 +300,8 @@ source "net/wimax/Kconfig"
 
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
+source "net/caif/Kconfig"
+source "net/ceph/Kconfig"
+
 
 endif   # if NET