From patchwork Thu Jun 2 10:18:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 629164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rL39S0993z9sD5 for ; Thu, 2 Jun 2016 20:19:07 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 193DE10618; Thu, 2 Jun 2016 03:19:06 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id D3C08105DE for ; Thu, 2 Jun 2016 03:19:04 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 4D9494203B3 for ; Thu, 2 Jun 2016 04:19:04 -0600 (MDT) X-ASG-Debug-ID: 1464862742-09eadd5c05104d90001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar5.cudamail.com with ESMTP id wh7jFnBLKJiKKUOy (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 02 Jun 2016 04:19:02 -0600 (MDT) X-Barracuda-Envelope-From: cascardo@redhat.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mx1.redhat.com) (209.132.183.28) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 2 Jun 2016 10:19:01 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at _spf1.redhat.com designates 209.132.183.28 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-Barracuda-RBL-IP: 209.132.183.28 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F1376407F for ; Thu, 2 Jun 2016 10:19:01 +0000 (UTC) Received: from indiana.gru.redhat.com (ovpn-116-146.phx2.redhat.com [10.3.116.146]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u52AIxjq001864 for ; Thu, 2 Jun 2016 06:19:00 -0400 X-CudaMail-Envelope-Sender: cascardo@redhat.com From: Thadeu Lima de Souza Cascardo To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-601003513 X-CudaMail-DTE: 060216 X-CudaMail-Originating-IP: 209.132.183.28 Date: Thu, 2 Jun 2016 07:18:47 -0300 X-ASG-Orig-Subj: [##CM-V3-601003513##][PATCH 1/3] netdev-vport: remove unneeded headers Message-Id: <1464862729-31563-1-git-send-email-cascardo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 02 Jun 2016 10:19:01 +0000 (UTC) X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1464862742 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 1/3] netdev-vport: remove unneeded headers X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Throughout the years, changes in netdev vport have removed the need for some of the headers, like shash, hmap, and many others. With the recent split of push/pop code, less headers are needed in each of the two modules. Signed-off-by: Thadeu Lima de Souza Cascardo --- lib/netdev-native-tnl.c | 27 ++++++--------------------- lib/netdev-native-tnl.h | 6 ++++++ lib/netdev-vport-private.h | 2 ++ lib/netdev-vport.c | 17 ++++------------- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index e144679..215bf42 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -16,11 +16,14 @@ #include +#include "netdev-native-tnl.h" + #include #include #include #include #include +#include #include #include @@ -28,36 +31,18 @@ #include #include -#include "openvswitch/list.h" #include "byte-order.h" #include "csum.h" -#include "daemon.h" -#include "dirs.h" -#include "dpif.h" #include "dp-packet.h" -#include "entropy.h" -#include "flow.h" -#include "hash.h" -#include "hmap.h" -#include "id-pool.h" -#include "netdev-provider.h" +#include "netdev.h" #include "netdev-vport.h" #include "netdev-vport-private.h" #include "odp-netlink.h" -#include "dp-packet.h" -#include "ovs-router.h" #include "packets.h" -#include "poll-loop.h" -#include "random.h" -#include "route-table.h" -#include "shash.h" -#include "socket-util.h" -#include "timeval.h" -#include "netdev-native-tnl.h" -#include "openvswitch/vlog.h" +#include "seq.h" #include "unaligned.h" #include "unixctl.h" -#include "util.h" +#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(native_tnl); static struct vlog_rate_limit err_rl = VLOG_RATE_LIMIT_INIT(60, 5); diff --git a/lib/netdev-native-tnl.h b/lib/netdev-native-tnl.h index ed81857..a912ce9 100644 --- a/lib/netdev-native-tnl.h +++ b/lib/netdev-native-tnl.h @@ -20,8 +20,14 @@ #include #include #include "compiler.h" +#include "dp-packet.h" +#include "packets.h" #include "unixctl.h" +struct netdev; +struct ovs_action_push_tnl; +struct netdev_tnl_build_header_params; + int netdev_gre_build_header(const struct netdev *netdev, struct ovs_action_push_tnl *data, diff --git a/lib/netdev-vport-private.h b/lib/netdev-vport-private.h index 8061841..d89a28c 100644 --- a/lib/netdev-vport-private.h +++ b/lib/netdev-vport-private.h @@ -20,6 +20,8 @@ #include #include #include "compiler.h" +#include "netdev.h" +#include "netdev-provider.h" #include "ovs-thread.h" struct netdev_vport { diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 40ca02c..6016fd8 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -27,31 +27,22 @@ #include #include "byte-order.h" -#include "csum.h" #include "daemon.h" #include "dirs.h" #include "dpif.h" -#include "dp-packet.h" -#include "openvswitch/dynamic-string.h" -#include "flow.h" -#include "hash.h" -#include "hmap.h" -#include "openvswitch/list.h" +#include "netdev.h" +#include "netdev-native-tnl.h" #include "netdev-provider.h" #include "netdev-vport-private.h" -#include "odp-netlink.h" -#include "dp-packet.h" #include "ovs-router.h" #include "packets.h" #include "poll-loop.h" #include "route-table.h" -#include "shash.h" +#include "smap.h" #include "socket-util.h" -#include "netdev-native-tnl.h" -#include "openvswitch/vlog.h" #include "unaligned.h" #include "unixctl.h" -#include "util.h" +#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_vport);