Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <df19b376-49a3-1ef2-0664-a23a48e128dc@gmail.com>
Date:   Thu, 3 Feb 2022 15:48:28 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.5.1
Subject: Re: [PATCH net-next] net: don't include ndisc.h from ipv6.h
Content-Language: en-US
To:     Jakub Kicinski <kuba@kernel.org>, davem@davemloft.net
Cc:     netdev@vger.kernel.org, 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
References: <20220203043457.2222388-1-kuba@kernel.org>
From:   David Ahern <dsahern@gmail.com>
In-Reply-To: <20220203043457.2222388-1-kuba@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2/2/22 9:34 PM, Jakub Kicinski wrote:
> 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 <linux/refcount.h>
>  #include <linux/jump_label_ratelimit.h>
>  #include <net/if_inet6.h>
> -#include <net/ndisc.h>
>  #include <net/flow.h>
>  #include <net/flow_dissector.h>
>  #include <net/snmp.h>
> 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 <linux/icmpv6.h>
>  #include <linux/kernel.h>
>  #include <net/addrconf.h>
>  #include <net/ipv6.h>
> 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;

ndisc_parse_options references net_device. This part seems unrelated to
the patch intent.

>  struct net_proto_family;
>  struct sk_buff;
>  struct prefix_info;