From patchwork Thu Feb 3 04:34:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 539833 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD208C433FE for ; Thu, 3 Feb 2022 04:35:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349291AbiBCEfH (ORCPT ); Wed, 2 Feb 2022 23:35:07 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:43546 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234031AbiBCEfG (ORCPT ); Wed, 2 Feb 2022 23:35:06 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 421096171A; Thu, 3 Feb 2022 04:35:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF466C340EB; Thu, 3 Feb 2022 04:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643862905; bh=J3CLrEhlOJTta1Pw3jPJy8ShYaMYmrnrd8RDIk5FRwo=; h=From:To:Cc:Subject:Date:From; b=fvyM3BDZx7IvF54M0LuomhAxdaeJ4K/B9e22+q2MCMXmW/EGv6vVoJZPFbpl1JfBG E4g962BMJoOUH2sxpE7C6o6MU1zsKg0ayvcsHr80CeCWNeQ0Cw4vWpk9o0DLaSv0xV D0MEWabZYcspS+DlqPwH/pn4TrnrH+AESbJoP5gzFYmOrDD01oU1/HtLr8epCX+d6h YNxK2pJ4Ut/W5ptFUBOm2u0KDrWpD9+ue5/2e28QZqXBHnxXqNfDvD4FJBGwFK+6OA gDyf0+4HF19l81igmkOiQ8hLaTxuNuH91iSgVRI2qS2JxvcAo254QTtG7hwjh4I8HG qcTTwHfkpUbrQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net, oliver@neukum.org, yoshfuji@linux-ipv6.org, dsahern@kernel.org, alex.aring@gmail.com, jukka.rissanen@linux.intel.com, stefan@datenfreihafen.org, jk@codeconstruct.com.au, matt@codeconstruct.com.au, linux-usb@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-wpan@vger.kernel.org Subject: [PATCH net-next] net: don't include ndisc.h from ipv6.h Date: Wed, 2 Feb 2022 20:34:57 -0800 Message-Id: <20220203043457.2222388-1-kuba@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Nothing in ipv6.h needs ndisc.h, drop it. Signed-off-by: Jakub Kicinski Acked-by: Jeremy Kerr Acked-by: Stefan Schmidt --- CC: j.vosburgh@gmail.com CC: vfalico@gmail.com CC: andy@greyhouse.net CC: oliver@neukum.org CC: yoshfuji@linux-ipv6.org CC: dsahern@kernel.org CC: alex.aring@gmail.com CC: jukka.rissanen@linux.intel.com CC: stefan@datenfreihafen.org CC: jk@codeconstruct.com.au CC: matt@codeconstruct.com.au CC: linux-usb@vger.kernel.org CC: linux-bluetooth@vger.kernel.org CC: linux-wpan@vger.kernel.org --- drivers/net/bonding/bond_alb.c | 1 + drivers/net/usb/cdc_mbim.c | 1 + include/net/ipv6.h | 1 - include/net/ipv6_frag.h | 1 + include/net/ndisc.h | 1 - net/6lowpan/core.c | 1 + net/ieee802154/6lowpan/core.c | 1 + net/mctp/device.c | 1 + 8 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index c98a4b0a8453..303c8d32d451 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 82bb5ed94c48..a7c1434fe2da 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -21,6 +21,7 @@ #include #include #include +#include /* alternative VLAN for IP session 0 if not untagged */ #define MBIM_IPS0_VID 4094 diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 082f30256f59..cda1f205f391 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/include/net/ipv6_frag.h b/include/net/ipv6_frag.h index 0a4779175a52..5052c66e22d2 100644 --- a/include/net/ipv6_frag.h +++ b/include/net/ipv6_frag.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _IPV6_FRAG_H #define _IPV6_FRAG_H +#include #include #include #include diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 53cb8de0e589..07d48bd6c0bd 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -71,7 +71,6 @@ do { \ struct ctl_table; struct inet6_dev; -struct net_device; struct net_proto_family; struct sk_buff; struct prefix_info; diff --git a/net/6lowpan/core.c b/net/6lowpan/core.c index a068757eabaf..7b3341cef926 100644 --- a/net/6lowpan/core.c +++ b/net/6lowpan/core.c @@ -5,6 +5,7 @@ * (C) 2015 Pengutronix, Alexander Aring */ +#include #include #include diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c index 2cf62718a282..2c087b7f17c5 100644 --- a/net/ieee802154/6lowpan/core.c +++ b/net/ieee802154/6lowpan/core.c @@ -47,6 +47,7 @@ #include #include #include +#include #include diff --git a/net/mctp/device.c b/net/mctp/device.c index ef2755f82f87..02ddc0f1bd3e 100644 --- a/net/mctp/device.c +++ b/net/mctp/device.c @@ -6,6 +6,7 @@ * Copyright (c) 2021 Google */ +#include #include #include #include