diff options
author | Paul Moore <paul.moore@hp.com> | 2006-11-05 19:44:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-11-05 19:44:06 -0500 |
commit | 38c94377a36f70e86665231c9f477e445c806618 (patch) | |
tree | 92beb31d6790a434b1965ca99e4fd2903a4da4f2 | |
parent | daccff024ffeb21caa2cc479ccc33b2ec50705b1 (diff) |
[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>
-rw-r--r-- | net/Kconfig | 3 | ||||
-rw-r--r-- | net/netlabel/Kconfig | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig index a81aca43932f..67e39ad8b8b6 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -63,6 +63,7 @@ config INET | |||
63 | if INET | 63 | if INET |
64 | source "net/ipv4/Kconfig" | 64 | source "net/ipv4/Kconfig" |
65 | source "net/ipv6/Kconfig" | 65 | source "net/ipv6/Kconfig" |
66 | source "net/netlabel/Kconfig" | ||
66 | 67 | ||
67 | endif # if INET | 68 | endif # if INET |
68 | 69 | ||
@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig" | |||
249 | config WIRELESS_EXT | 250 | config WIRELESS_EXT |
250 | bool | 251 | bool |
251 | 252 | ||
252 | source "net/netlabel/Kconfig" | ||
253 | |||
254 | config FIB_RULES | 253 | config FIB_RULES |
255 | bool | 254 | bool |
256 | 255 | ||
diff --git a/net/netlabel/Kconfig b/net/netlabel/Kconfig index 9f7121ae13e9..56958c85f2b4 100644 --- a/net/netlabel/Kconfig +++ b/net/netlabel/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | config NETLABEL | 5 | config NETLABEL |
6 | bool "NetLabel subsystem support" | 6 | bool "NetLabel subsystem support" |
7 | depends on NET && SECURITY | 7 | depends on SECURITY |
8 | default n | 8 | default n |
9 | ---help--- | 9 | ---help--- |
10 | NetLabel provides support for explicit network packet labeling | 10 | NetLabel provides support for explicit network packet labeling |