From: Michael S. Tsirkin Date: Thu, 21 Jan 2010 09:28:45 +0000 (-0800) Subject: vhost: fix TUN=m VHOST_NET=y X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17660f81243e998f36257881ac3ae61685bf91c1;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Michael S. Tsirkin Acked-by: Randy Dunlap Signed-off-by: David S. Miller --- diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 9f409f447aea..9e9355367bb3 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