nfsd: simplify fh_verify access checks

[safe/jmp/linux-2.6] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 6ec2cce..041c35e 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig NET
        bool "Networking support"
 
 menuconfig NET
        bool "Networking support"

+       select NLATTR

        ---help---
          Unless you really know what you are doing, you should say Y here.
          The reason is that some programs need kernel networking support even
        ---help---
          Unless you really know what you are doing, you should say Y here.
          The reason is that some programs need kernel networking support even


@@ -22,18 +23,27 @@ menuconfig NET
 
 if NET
 
 
 if NET
 

-menu "Networking options"
+config WANT_COMPAT_NETLINK_MESSAGES
+       bool
+       help
+         This option can be selected by other options that need compat
+         netlink messages.

 
 

-config NET_NS
-       bool "Network namespace support"
-       default n
-       depends on EXPERIMENTAL && NAMESPACES
+config COMPAT_NETLINK_MESSAGES
+       def_bool y
+       depends on COMPAT
+       depends on WIRELESS_EXT || WANT_COMPAT_NETLINK_MESSAGES

        help
        help

-         Allow user space to create what appear to be multiple instances
-         of the network stack.
+         This option makes it possible to send different netlink messages
+         to tasks depending on whether the task is a compat task or not. To
+         achieve this, you need to set skb_shinfo(skb)->frag_list to the
+         compat skb before sending the skb, the netlink code will sort out
+         which message to actually pass to the task.

 
 

-config COMPAT_NET_DEV_OPS
-       def_bool y
+         Newly written code should NEVER need this option but do
+         compat-independent messages instead!
+
+menu "Networking options"

 
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"


@@ -129,12 +139,6 @@ menuconfig NETFILTER
          <file:Documentation/Changes> under "iptables" for the location of
          these packages.
 
          <file:Documentation/Changes> under "iptables" for the location of
          these packages.
 

-         Make sure to say N to "Fast switching" below if you intend to say Y
-         here, as Fast switching currently bypasses netfilter.
-
-         Chances are that you should say Y here if you compile a kernel which
-         will run as a router and N for regular hosts. If unsure, say N.
-

 if NETFILTER
 
 config NETFILTER_DEBUG
 if NETFILTER
 
 config NETFILTER_DEBUG


@@ -150,7 +154,7 @@ config NETFILTER_ADVANCED
        default y
        help
          If you say Y here you can select between all the netfilter modules.
        default y
        help
          If you say Y here you can select between all the netfilter modules.

-         If you say N the more ununsual ones will not be shown and the
+         If you say N the more unusual ones will not be shown and the

          basic ones needed by most people will default to 'M'.
 
          If unsure, say Y.
          basic ones needed by most people will default to 'M'.
 
          If unsure, say Y.


@@ -179,6 +183,7 @@ endif
 
 source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"
 
 source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"

+source "net/rds/Kconfig"

 source "net/tipc/Kconfig"
 source "net/atm/Kconfig"
 source "net/802/Kconfig"
 source "net/tipc/Kconfig"
 source "net/atm/Kconfig"
 source "net/802/Kconfig"


@@ -193,6 +198,8 @@ source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/lapb/Kconfig"
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"

+source "net/phonet/Kconfig"
+source "net/ieee802154/Kconfig"

 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
 
 source "net/sched/Kconfig"
 source "net/dcb/Kconfig"
 


@@ -228,6 +235,17 @@ config NET_TCPPROBE
        To compile this code as a module, choose M here: the
        module will be called tcp_probe.
 
        To compile this code as a module, choose M here: the
        module will be called tcp_probe.
 

+config NET_DROP_MONITOR
+       boolean "Network packet drop alerting service"
+       depends on INET && EXPERIMENTAL && TRACEPOINTS
+       ---help---
+       This feature provides an alerting service to userspace in the
+       event that packets are discarded in the network stack.  Alerts
+       are broadcast via netlink socket to any listening user space
+       process.  If you don't need network drop alerts, or if you are ok
+       just checking the various proc files and other utilities for
+       drop statistics, say N here.
+

 endmenu
 
 endmenu
 endmenu
 
 endmenu


@@ -237,7 +255,6 @@ source "net/can/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"

-source "net/phonet/Kconfig"

 
 config FIB_RULES
        bool
 
 config FIB_RULES
        bool


@@ -254,6 +271,8 @@ source "net/mac80211/Kconfig"
 
 endif # WIRELESS
 
 
 endif # WIRELESS
 

+source "net/wimax/Kconfig"
+

 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
 
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"