From patchwork Sat May 4 00:49:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 241418 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 F3A512C0760 for ; Sat, 4 May 2013 10:50:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763273Ab3EDAuB (ORCPT ); Fri, 3 May 2013 20:50:01 -0400 Received: from mail-da0-f44.google.com ([209.85.210.44]:37425 "EHLO mail-da0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756996Ab3EDAuA (ORCPT ); Fri, 3 May 2013 20:50:00 -0400 Received: by mail-da0-f44.google.com with SMTP id z8so1033175daj.3 for ; Fri, 03 May 2013 17:49:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=5D7RqETeA55JbMQkBMOI+YA5AV/oswgnnSkdgMZESKc=; b=DlfcBd/pb+SiFXouXLfYODq/bOnyFq2tcAVMrRKZL9DdY6rokrLgXyZWLUCv9MGeVK ntQP3LjxjG0WuyY38SfD7i/YtsjLxZuIPaOlrVseQHySklxDYqe5FXXvrDywUGEa5fhE nR0hADSxbKnG9frlbb27ipOcg1gLCIFgfuawYNcTk3TwNhgLZj6lgTWdlpNA0zJY4iRN NRgy+iuxADUuBIkANvlRo7HkiM0zp13qM/vSdICQM2vdB/4nptVMKwdWphED19f87daN YPq/oJPu3tPdInIdTdBWZUlWmIOnifuQarb/W17Dl0/uYeP+pzHvX6F0aPU9FkmApOvg Y3Ug== X-Received: by 10.68.164.130 with SMTP id yq2mr16228413pbb.106.1367628599494; Fri, 03 May 2013 17:49:59 -0700 (PDT) Received: from nehalam.linuxnetplumber.net (static-50-53-71-109.bvtn.or.frontiernet.net. [50.53.71.109]) by mx.google.com with ESMTPSA id zy5sm13529684pbb.43.2013.05.03.17.49.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 17:49:59 -0700 (PDT) Date: Fri, 3 May 2013 17:49:41 -0700 From: Stephen Hemminger To: David Miller , Jason Wang Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Amos Kong Subject: [PATCH] virtio: don't expose u16 in userspace api Message-ID: <20130503174941.043d10b7@nehalam.linuxnetplumber.net> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Gm-Message-State: ALoCoQlQxzuiQd1P8DrP2u1JFElT5reNCR4oEo59606WVGzuFGX92zqq1CJ5n/kI8A7Uu7VKNnHg Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Programs using virtio headers outside of kernel will no longer build because u16 type does not exist in userspace. All user ABI must use __u16 typedef instead. Bug introduce by: commit 986a4f4d452dec004697f667439d27c3fda9c928 Author: Jason Wang Date: Fri Dec 7 07:04:56 2012 +0000 virtio_net: multiqueue support Signed-off-by: Stephen Hemminger --- Patch against -net but should go to stable for 3.9.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/include/uapi/linux/virtio_net.h 2013-05-02 14:30:53.362557982 -0700 +++ b/include/uapi/linux/virtio_net.h 2013-05-03 17:44:06.028365521 -0700 @@ -191,7 +191,7 @@ struct virtio_net_ctrl_mac { * specified. */ struct virtio_net_ctrl_mq { - u16 virtqueue_pairs; + __u16 virtqueue_pairs; }; #define VIRTIO_NET_CTRL_MQ 4