Commit 38c94377 authored by Paul Moore's avatar Paul Moore Committed by David S. Miller

[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: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent daccff02
...@@ -63,6 +63,7 @@ config INET ...@@ -63,6 +63,7 @@ config INET
if INET if INET
source "net/ipv4/Kconfig" source "net/ipv4/Kconfig"
source "net/ipv6/Kconfig" source "net/ipv6/Kconfig"
source "net/netlabel/Kconfig"
endif # if INET endif # if INET
...@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig" ...@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig"
config WIRELESS_EXT config WIRELESS_EXT
bool bool
source "net/netlabel/Kconfig"
config FIB_RULES config FIB_RULES
bool bool
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
config NETLABEL config NETLABEL
bool "NetLabel subsystem support" bool "NetLabel subsystem support"
depends on NET && SECURITY depends on SECURITY
default n default n
---help--- ---help---
NetLabel provides support for explicit network packet labeling NetLabel provides support for explicit network packet labeling
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment