From patchwork Mon May 1 18:24:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Brandeburg X-Patchwork-Id: 757283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wGtBb2gvtz9sNB for ; Tue, 2 May 2017 04:25:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A65B86456; Mon, 1 May 2017 18:25:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Msb3rErKeDXS; Mon, 1 May 2017 18:25:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E7B6D86411; Mon, 1 May 2017 18:25:02 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E4F031BFF95 for ; Mon, 1 May 2017 18:24:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B69E68625E for ; Mon, 1 May 2017 18:24:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l62HHDp3NLOF for ; Mon, 1 May 2017 18:24:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A5FAA86385 for ; Mon, 1 May 2017 18:24:53 +0000 (UTC) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 May 2017 11:24:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,401,1488873600"; d="scan'208";a="95955319" Received: from jbrandeb-hsm2.jf.intel.com ([10.166.29.107]) by fmsmga005.fm.intel.com with ESMTP; 01 May 2017 11:24:52 -0700 From: Jesse Brandeburg To: intel-wired-lan@lists.osuosl.org Date: Mon, 1 May 2017 11:24:49 -0700 Message-Id: <1493663091-27870-12-git-send-email-jesse.brandeburg@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1493663091-27870-11-git-send-email-jesse.brandeburg@intel.com> References: <1493663091-27870-1-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-2-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-3-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-4-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-5-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-6-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-7-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-8-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-9-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-10-git-send-email-jesse.brandeburg@intel.com> <1493663091-27870-11-git-send-email-jesse.brandeburg@intel.com> Subject: [Intel-wired-lan] [PATCH net-next v1 11/13] virtchnl: Add pad fields to a couple of structures X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" From: Sridhar Samudrala This removes holes and makes structure sizes consistent across 32 and 64 bit builds. Signed-off-by: Sridhar Samudrala Signed-off-by: Jesse Brandeburg diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h index 3f15d6a..ea34154 100644 --- a/include/linux/avf/virtchnl.h +++ b/include/linux/avf/virtchnl.h @@ -275,8 +275,10 @@ struct virtchnl_rxq_info { u16 splithdr_enabled; /* deprecated with AVF 1.0 */ u32 databuffer_size; u32 max_pkt_size; + u32 pad1; u64 dma_ring_addr; enum virtchnl_rx_hsplit rx_split_pos; /* deprecated with AVF 1.0 */ + u32 pad2; }; /* VIRTCHNL_OP_CONFIG_VSI_QUEUES @@ -295,6 +297,7 @@ struct virtchnl_queue_pair_info { struct virtchnl_vsi_queue_config_info { u16 vsi_id; u16 num_queue_pairs; + u32 pad; struct virtchnl_queue_pair_info qpair[1]; };