From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 734F0C282DD for ; Sat, 20 Apr 2019 16:27:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4229D20850 for ; Sat, 20 Apr 2019 16:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555777659; bh=NcGUMZYUaHHdIMqHsJdjHuRcLI6Bme9Ux4lr3R2h7+Q=; h=From:To:Cc:Subject:Date:List-ID:From; b=zBcJLw1Sw7TWPODqWUIV8KrmmhfRm9cEVXFO1gHMUKbQYYaiENPLn1ZfjfbuT/Bnz XDlddx2BlIXGN/Le7QvGC0P3XehLsrhPT9uK/pKV7hcnjge3a3RHDOoHn3Pph83YFc IDfvc2jgwejP7fZ5Ndr4jz/uw34CP9qKRJcgnxvE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728381AbfDTQ1i (ORCPT ); Sat, 20 Apr 2019 12:27:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:39596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727640AbfDTQ1i (ORCPT ); Sat, 20 Apr 2019 12:27:38 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94FCB20850; Sat, 20 Apr 2019 16:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555777656; bh=NcGUMZYUaHHdIMqHsJdjHuRcLI6Bme9Ux4lr3R2h7+Q=; h=From:To:Cc:Subject:Date:From; b=LJlMRhjzgKLPnm8L/J/qzT97n4bCVvtONalwgbNJ4zXtlccGULRUlPs/mEOZp4XG+ DwOFeACf9CaTI+PpuX9SIXrJPIm0NSTxJjSWjyqoenM166XwFCoQsdyMQjTFcfKikT nkqyRsDV3ESAJTs90hqvxnrhhbY/e8Kiho7GvXW0= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH net-next] net: Rename net/nexthop.h net/rtnh.h Date: Sat, 20 Apr 2019 09:28:20 -0700 Message-Id: <20190420162820.26989-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern The header contains rtnh_ macros so rename the file accordingly. Allows a later patch to use the nexthop.h name for the new nexthop code. Signed-off-by: David Ahern --- include/net/{nexthop.h => rtnh.h} | 4 ++-- net/core/lwtunnel.c | 2 +- net/decnet/dn_fib.c | 2 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv6/route.c | 2 +- net/mpls/af_mpls.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename include/net/{nexthop.h => rtnh.h} (94%) diff --git a/include/net/nexthop.h b/include/net/rtnh.h similarity index 94% rename from include/net/nexthop.h rename to include/net/rtnh.h index 902ff382a6dc..aa2cfc508f7c 100644 --- a/include/net/nexthop.h +++ b/include/net/rtnh.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __NET_NEXTHOP_H -#define __NET_NEXTHOP_H +#ifndef __NET_RTNH_H +#define __NET_RTNH_H #include #include diff --git a/net/core/lwtunnel.c b/net/core/lwtunnel.c index dc1aee54faeb..94749e0e2cfd 100644 --- a/net/core/lwtunnel.c +++ b/net/core/lwtunnel.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #ifdef CONFIG_MODULES diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index 6cd3737593a6..7e47ffdd1412 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #define RT_MIN_TABLE 1 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index b99a35766367..4336f1ec8ab0 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 9a3f13edc98e..a8eb97777c0a 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 70f23f41f489..a3497871de59 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 8120e04f15e4..e321a5fafb87 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -23,7 +23,7 @@ #include #endif #include -#include +#include #include "internal.h" /* max memory we will use for mpls_route */ -- 2.11.0