summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2010-01-21 01:28:45 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-21 01:28:45 -0800
commit17660f81243e998f36257881ac3ae61685bf91c1 (patch)
treea716bacdf97e7baff157b0ec0cb2f77ebe54c09c
parent4b258461c0b31ded170a1a56b944b0fded1c887b (diff)
vhost: fix TUN=m VHOST_NET=y
drivers/built-in.o: In function `get_tun_socket': net.c:(.text+0x15436e): undefined reference to `tun_get_socket' If tun is a module, vhost must be a module, too. If tun is built-in or disabled, vhost can be built-in. Note: TUN || !TUN might look a bit strange until you realize that boolean logic rules do not apply for tristate variables. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/vhost/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index 9f409f447ae..9e9355367bb 100644
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -1,6 +1,6 @@
config VHOST_NET
tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
- depends on NET && EVENTFD && EXPERIMENTAL
+ depends on NET && EVENTFD && (TUN || !TUN) && EXPERIMENTAL
---help---
This kernel module can be loaded in host kernel to accelerate
guest networking with virtio_net. Not to be confused with virtio_net