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 <[email protected]>

Signed-off-by Michael S. Tsirkin <[email protected]>

---

The above was already applied by Rusty, but got lost. The patch is on top of net-next.

 drivers/vhost/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/vhost/Kconfig +1 -1

index 9f409f4..9e93553 100644
@@ -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

Signature · 1 line

1.6.6.144.g5c3af

Quoted 7 lines

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.

Quoted 5 lines

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 <[email protected]>

Signed-off-by Michael S. Tsirkin <[email protected]>

Acked-by Randy Dunlap <[email protected]>