From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH] vhost: fix TUN=m VHOST_NET=y Date: Wed, 20 Jan 2010 13:30:38 +0200 Message-ID: <20100120113037.GA9182@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: "Michael S. Tsirkin" , Rusty Russell , "David S. Miller" , netdev@vger.kernel.org, Stephen Rothwell , Return-path: Received: from mx1.redhat.com ([209.132.183.28]:9163 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962Ab0ATLdw (ORCPT ); Wed, 20 Jan 2010 06:33:52 -0500 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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(-) diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 9f409f4..9e93553 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 -- 1.6.6.144.g5c3af