From patchwork Mon Dec 10 02:37:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 204814 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1919F2C0253 for ; Mon, 10 Dec 2012 13:37:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751284Ab2LJCh3 (ORCPT ); Sun, 9 Dec 2012 21:37:29 -0500 Received: from haggis.pcug.org.au ([203.10.76.10]:49981 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750823Ab2LJCh1 (ORCPT ); Sun, 9 Dec 2012 21:37:27 -0500 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 9B51F1640CC; Mon, 10 Dec 2012 13:37:26 +1100 (EST) Date: Mon, 10 Dec 2012 13:37:25 +1100 From: Stephen Rothwell To: Rusty Russell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Wang , David Miller , Subject: linux-next: build failure after merge of the virtio tree Message-Id: <20121210133725.cb4a76545691b099c73c40ea@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Rusty, After merging the virtio tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/virtio_net.c: In function 'vq2txq': drivers/net/virtio_net.c:150:2: error: implicit declaration of function 'virtqueue_get_queue_index' [-Werror=implicit-function-declaration] Caused by commit 986a4f4d452d ("virtio_net: multiqueue support") from the net-next tree interacting with commit 105e892960e1 ("virtio: move queue_index and num_free fields into core struct virtqueue") from the virtio tree. I applied the patch below and can carry it as necessary. From: Stephen Rothwell Date: Mon, 10 Dec 2012 13:33:57 +1100 Subject: [PATCH] virtnet: for up for virtqueue_get_queue_index removal Signed-off-by: Stephen Rothwell --- drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 33d6f6f..8afe32d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -147,7 +147,7 @@ struct padded_vnet_hdr { */ static int vq2txq(struct virtqueue *vq) { - return (virtqueue_get_queue_index(vq) - 1) / 2; + return (vq->index - 1) / 2; } static int txq2vq(int txq) @@ -157,7 +157,7 @@ static int txq2vq(int txq) static int vq2rxq(struct virtqueue *vq) { - return virtqueue_get_queue_index(vq) / 2; + return vq->index / 2; } static int rxq2vq(int rxq)