From patchwork Fri Mar 15 17:38:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 228120 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 B60A82C009C for ; Sat, 16 Mar 2013 04:39:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754431Ab3CORjF (ORCPT ); Fri, 15 Mar 2013 13:39:05 -0400 Received: from na3sys009aog130.obsmtp.com ([74.125.149.143]:51075 "HELO na3sys009aog130.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751901Ab3CORjD (ORCPT ); Fri, 15 Mar 2013 13:39:03 -0400 Received: from mail-oa0-f72.google.com ([209.85.219.72]) (using TLSv1) by na3sys009aob130.postini.com ([74.125.148.12]) with SMTP ID DSNKUUNctw2HZBJyeHH6qaoMNPlVQU2nBQll@postini.com; Fri, 15 Mar 2013 10:39:03 PDT Received: by mail-oa0-f72.google.com with SMTP id j6so18927113oag.11 for ; Fri, 15 Mar 2013 10:39:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=sosr11OChFPSXCMC+KtwCxlJaucFGAVQeF6ZkY6sYBg=; b=pHktAhKnH+wWe/F6rj+/UwQDxtDfeAHGb0SpcDhVJMrvEWbhgLaR+BoNgUOR4Wq6Xj o+GIeNh4PtC/QjYM/NhARXsPEAZOOJpgclRjhdt/SGnsryz/Pd2IuyHpDrVvDlrWV8AO /q2/gyJWFzy9Dgz+a67ESwXgh6YVIxjRtmn1JMsZ/27jmf83uAsqIKISny84+GWZR3+5 WeRGlj60VraPyEkJIyRkObK0HUhs6chm3lwwg8reydjFWszzXgpvpKSjCFz/sjUW27DM t+EdikzBA3Jl6JgQioYSPARj3+bg50oUfIvk5USaxHAnvGEJtKNj29is5tBUTzOO79zj iSmQ== X-Received: by 10.182.93.193 with SMTP id cw1mr3276534obb.93.1363369142591; Fri, 15 Mar 2013 10:39:02 -0700 (PDT) X-Received: by 10.182.93.193 with SMTP id cw1mr3276528obb.93.1363369142501; Fri, 15 Mar 2013 10:39:02 -0700 (PDT) Received: from ubuntu.localdomain (c-24-7-88-182.hsd1.ca.comcast.net. [24.7.88.182]) by mx.google.com with ESMTPS id j4sm2905572oea.3.2013.03.15.10.39.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Mar 2013 10:39:01 -0700 (PDT) From: Jesse Gross To: David Miller Cc: netdev@vger.kernel.org, dev@openvswitch.org, Thomas Graf , Jesse Gross Subject: [PATCH net-next 2/5] openvswitch: Avoid useless holes in struct vport Date: Fri, 15 Mar 2013 10:38:48 -0700 Message-Id: <1363369131-16830-3-git-send-email-jesse@nicira.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363369131-16830-1-git-send-email-jesse@nicira.com> References: <1363369131-16830-1-git-send-email-jesse@nicira.com> X-Gm-Message-State: ALoCoQlTskMjf82LHLUstnK27HBSF5ufVAy6B3QR/10JOEEBbBs5Pznbu10bZ+64OlkPy3UhFKd4OW8ss0LI6QOMwGZ+OrI8AD9dfvoY8EvOSUZENhIpKpiAtJ1pHEonigK8/vpaom3+6DJOYy0EDDMahaFWEYDn2fPBQNp0LfS5oZrmKAsJIjE= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thomas Graf Having the 16bit port_no in between a set of pointers creates an unwanted and useless hole in the struct. Signed-off-by: Thomas Graf Signed-off-by: Jesse Gross --- net/openvswitch/vport.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 3f7961e..aee7d43 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -68,10 +68,10 @@ struct vport_err_stats { /** * struct vport - one port within a datapath * @rcu: RCU callback head for deferred destruction. - * @port_no: Index into @dp's @ports array. * @dp: Datapath to which this port belongs. * @upcall_portid: The Netlink port to use for packets received on this port that * miss the flow table. + * @port_no: Index into @dp's @ports array. * @hash_node: Element in @dev_table hash table in vport.c. * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. * @ops: Class structure. @@ -81,9 +81,9 @@ struct vport_err_stats { */ struct vport { struct rcu_head rcu; - u16 port_no; struct datapath *dp; u32 upcall_portid; + u16 port_no; struct hlist_node hash_node; struct hlist_node dp_hash_node;