ip: generate unique IP identificator if local fragmentation is allowed

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0a2c4bcf179e21d321b25206718cb58aad722b54..18bd9e3d327496b94c62e0c0555167ede4159148 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1123,7 +1123,6 @@ config IPC_NS
 
 config USER_NS
        bool "User namespace"
 
 config USER_NS
        bool "User namespace"

-       depends on UIDGID_CONVERTED

        select UIDGID_STRICT_TYPE_CHECKS
 
        default n
        select UIDGID_STRICT_TYPE_CHECKS
 
        default n


@@ -1157,20 +1156,8 @@ config NET_NS
 
 endif # NAMESPACES
 
 
 endif # NAMESPACES
 

-config UIDGID_CONVERTED
-       # True if all of the selected software conmponents are known
-       # to have uid_t and gid_t converted to kuid_t and kgid_t
-       # where appropriate and are otherwise safe to use with
-       # the user namespace.
-       bool
-       default y
-
-       # Filesystems
-       depends on XFS_FS = n
-

 config UIDGID_STRICT_TYPE_CHECKS
        bool "Require conversions between uid/gids and their internal representation"
 config UIDGID_STRICT_TYPE_CHECKS
        bool "Require conversions between uid/gids and their internal representation"

-       depends on UIDGID_CONVERTED

        default n
        help
         While the nececessary conversions are being added to all subsystems this option allows
        default n
        help
         While the nececessary conversions are being added to all subsystems this option allows


@@ -1683,6 +1670,7 @@ config BASE_SMALL
 
 menuconfig MODULES
        bool "Enable loadable module support"
 
 menuconfig MODULES
        bool "Enable loadable module support"

+       option modules

        help
          Kernel modules are small pieces of compiled code which can
          be inserted in the running kernel, rather than being
        help
          Kernel modules are small pieces of compiled code which can
          be inserted in the running kernel, rather than being