diff options
| author | Paul Moore <paul.moore@hp.com> | 2006-11-05 16:44:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-11-05 16:44:06 -0800 |
| commit | 38c94377a36f70e86665231c9f477e445c806618 (patch) | |
| tree | 92beb31d6790a434b1965ca99e4fd2903a4da4f2 /net | |
| parent | daccff024ffeb21caa2cc479ccc33b2ec50705b1 (diff) | |
| download | linux-3.10-38c94377a36f70e86665231c9f477e445c806618.tar.gz linux-3.10-38c94377a36f70e86665231c9f477e445c806618.tar.bz2 linux-3.10-38c94377a36f70e86665231c9f477e445c806618.zip | |
[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>
Diffstat (limited to '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 a81aca43932..67e39ad8b8b 100644 --- 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 9f7121ae13e..56958c85f2b 100644 --- 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 |