[NETLABEL]: Fix build failure.

> the build with the attached .config failed, make ends with:
> ...
> : undefined reference to `cipso_v4_sock_getattr'
> net/built-in.o: In function `netlbl_socket_getattr':

 ...

It looks like I was stupid and made NetLabel depend on CONFIG_NET and not
CONFIG_INET, the patch below should fix this by making NetLabel depend on
CONFIG_INET and CONFIG_SECURITY.  Please review and apply for 2.6.19.

Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/Kconfig b/net/Kconfig
index a81aca43932f975ed912e1f00482e24b5a6d7102..67e39ad8b8b6bfc92dff7745e8517f53fd73f54b 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -63,6 +63,7 @@ config INET
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
+source "net/netlabel/Kconfig"
 
 endif # if INET
 
@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
        bool
 
-source "net/netlabel/Kconfig"
-
 config FIB_RULES
        bool
 

diff --git a/net/netlabel/Kconfig b/net/netlabel/Kconfig
index 9f7121ae13e904fc4871d4b7c2271f9562b61ed8..56958c85f2b448576e2aa3daa5e2d6b80569fe8a 100644 (file)
--- a/net/netlabel/Kconfig
+++ b/net/netlabel/Kconfig
@@ -4,7 +4,7 @@
 
 config NETLABEL
        bool "NetLabel subsystem support"
-       depends on NET && SECURITY
+       depends on SECURITY
        default n
        ---help---
          NetLabel provides support for explicit network packet labeling