From patchwork Mon Jun 19 21:33:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 777983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ws43x6D1xz9s2G for ; Tue, 20 Jun 2017 07:34:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C424ABCC; Mon, 19 Jun 2017 21:33:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 22267BAF for ; Mon, 19 Jun 2017 21:33:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 8F0ADEB for ; Mon, 19 Jun 2017 21:33:37 +0000 (UTC) Received: from mfilter19-d.gandi.net (mfilter19-d.gandi.net [217.70.178.147]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 6B26AFB87D; Mon, 19 Jun 2017 23:33:36 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter19-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter19-d.gandi.net (mfilter19-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id ANHk5Hrp93cR; Mon, 19 Jun 2017 23:33:35 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from carno.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 4D582FB887; Mon, 19 Jun 2017 23:33:32 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Mon, 19 Jun 2017 14:33:23 -0700 Message-Id: <20170619213323.14220-2-joe@ovn.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170619213323.14220-1-joe@ovn.org> References: <20170619213323.14220-1-joe@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Simon Horman , Flavio Leitner Subject: [ovs-dev] [PATCH 2/2] tc: Tidy up includes. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Fix minor style variations and unnecessary includes. Signed-off-by: Joe Stringer Tested-by: Greg Rose Acked-by: Greg Rose --- lib/netdev-linux.c | 1 + lib/netdev-tc-offloads.c | 11 ++++++----- lib/tc.c | 6 ++++-- lib/tc.h | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index f5dc30fbc188..6978c44c796a 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 940e20ff2759..621402303c8d 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -16,24 +16,25 @@ #include #include "netdev-tc-offloads.h" + #include #include + +#include "dpif.h" +#include "hash.h" #include "openvswitch/hmap.h" #include "openvswitch/match.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/thread.h" #include "openvswitch/types.h" #include "openvswitch/vlog.h" -#include "netdev-provider.h" +#include "netdev-linux.h" #include "netlink.h" #include "netlink-socket.h" #include "odp-netlink.h" +#include "tc.h" #include "unaligned.h" #include "util.h" -#include "hash.h" -#include "dpif.h" -#include "tc.h" -#include "netdev-linux.h" VLOG_DEFINE_THIS_MODULE(netdev_tc_offloads); diff --git a/lib/tc.c b/lib/tc.c index 9ca7b76ce27f..401690ec98c7 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc. + * Copyright (c) 2009-2017 Nicira, Inc. * Copyright (c) 2016 Mellanox Technologies, Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,6 +17,7 @@ #include #include "tc.h" + #include #include #include @@ -26,6 +27,7 @@ #include #include #include + #include "byte-order.h" #include "netlink-socket.h" #include "netlink.h" @@ -33,7 +35,7 @@ #include "openvswitch/vlog.h" #include "packets.h" #include "timeval.h" -#include +#include "unaligned.h" VLOG_DEFINE_THIS_MODULE(tc); diff --git a/lib/tc.h b/lib/tc.h index 61188dd43ec3..1cc7362d59ae 100644 --- a/lib/tc.h +++ b/lib/tc.h @@ -21,8 +21,8 @@ #include /* Must happen before linux/pkt_cls.h - Glibc #20215 */ #include #include -#include -#include "lib/netlink-socket.h" + +#include "netlink-socket.h" #include "odp-netlink.h" #include "openvswitch/ofpbuf.h"