* [PATCH net-next] net: don't include ndisc.h from ipv6.h
@ 2022-02-03 4:34 Jakub Kicinski
2022-02-03 4:53 ` Jeremy Kerr
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jakub Kicinski @ 2022-02-03 4:34 UTC (permalink / raw)
To: davem
Cc: netdev, Jakub Kicinski, j.vosburgh, vfalico, andy, oliver,
yoshfuji, dsahern, alex.aring, jukka.rissanen, stefan, jk, matt,
linux-usb, linux-bluetooth, linux-wpan
Nothing in ipv6.h needs ndisc.h, drop it.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
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 <linux/in.h>
#include <net/arp.h>
#include <net/ipv6.h>
+#include <net/ndisc.h>
#include <asm/byteorder.h>
#include <net/bonding.h>
#include <net/bond_alb.h>
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 <net/ipv6.h>
#include <net/addrconf.h>
#include <net/ipv6_stubs.h>
+#include <net/ndisc.h>
/* 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 <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;
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 <aar@pengutronix.de>
*/
+#include <linux/if_arp.h>
#include <linux/module.h>
#include <net/6lowpan.h>
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 <linux/module.h>
#include <linux/netdevice.h>
#include <linux/ieee802154.h>
+#include <linux/if_arp.h>
#include <net/ipv6.h>
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 <linux/if_arp.h>
#include <linux/if_link.h>
#include <linux/mctp.h>
#include <linux/netdevice.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: don't include ndisc.h from ipv6.h
2022-02-03 4:34 [PATCH net-next] net: don't include ndisc.h from ipv6.h Jakub Kicinski
@ 2022-02-03 4:53 ` Jeremy Kerr
2022-02-03 5:13 ` [net-next] " bluez.test.bot
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jeremy Kerr @ 2022-02-03 4:53 UTC (permalink / raw)
To: Jakub Kicinski, davem
Cc: netdev, j.vosburgh, vfalico, andy, oliver, yoshfuji, dsahern,
alex.aring, jukka.rissanen, stefan, matt, linux-usb,
linux-bluetooth, linux-wpan
Hi Jakub,
> Nothing in ipv6.h needs ndisc.h, drop it.
Looks good, we lose the ARPHRD definitions without ndisc.h, but your
change to add if_arp.h addresses that:
> --- a/net/mctp/device.c
> +++ b/net/mctp/device.c
> @@ -6,6 +6,7 @@
> * Copyright (c) 2021 Google
> */
>
> +#include <linux/if_arp.h>
> #include <linux/if_link.h>
> #include <linux/mctp.h>
> #include <linux/netdevice.h>
So, for the net/mctp part:
Acked-by: Jeremy Kerr <jk@codeconstruct.com.au>
Cheers,
Jeremy
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [net-next] net: don't include ndisc.h from ipv6.h
2022-02-03 4:34 [PATCH net-next] net: don't include ndisc.h from ipv6.h Jakub Kicinski
2022-02-03 4:53 ` Jeremy Kerr
@ 2022-02-03 5:13 ` bluez.test.bot
2022-02-03 15:14 ` [PATCH net-next] " Stefan Schmidt
2022-02-03 22:48 ` David Ahern
3 siblings, 0 replies; 6+ messages in thread
From: bluez.test.bot @ 2022-02-03 5:13 UTC (permalink / raw)
To: linux-bluetooth, kuba
[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=610900
---Test result---
Test Summary:
CheckPatch PASS 2.97 seconds
GitLint PASS 0.99 seconds
SubjectPrefix FAIL 0.88 seconds
BuildKernel PASS 34.97 seconds
BuildKernel32 PASS 31.56 seconds
Incremental Build with patchesPASS 44.18 seconds
TestRunner: Setup PASS 554.52 seconds
TestRunner: l2cap-tester PASS 15.40 seconds
TestRunner: bnep-tester PASS 6.96 seconds
TestRunner: mgmt-tester PASS 116.67 seconds
TestRunner: rfcomm-tester PASS 8.70 seconds
TestRunner: sco-tester PASS 8.99 seconds
TestRunner: smp-tester PASS 8.75 seconds
TestRunner: userchan-tester PASS 7.12 seconds
Details
##############################
Test: SubjectPrefix - FAIL - 0.88 seconds
Check subject contains "Bluetooth" prefix
"Bluetooth: " is not specified in the subject
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: don't include ndisc.h from ipv6.h
2022-02-03 4:34 [PATCH net-next] net: don't include ndisc.h from ipv6.h Jakub Kicinski
2022-02-03 4:53 ` Jeremy Kerr
2022-02-03 5:13 ` [net-next] " bluez.test.bot
@ 2022-02-03 15:14 ` Stefan Schmidt
2022-02-03 22:48 ` David Ahern
3 siblings, 0 replies; 6+ messages in thread
From: Stefan Schmidt @ 2022-02-03 15:14 UTC (permalink / raw)
To: Jakub Kicinski, davem
Cc: netdev, j.vosburgh, vfalico, andy, oliver, yoshfuji, dsahern,
alex.aring, jukka.rissanen, jk, matt, linux-usb, linux-bluetooth,
linux-wpan
Hello.
On 03.02.22 05:34, Jakub Kicinski wrote:
> Nothing in ipv6.h needs ndisc.h, drop it.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> 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 +
For ieee802154:
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
regards
Stefan Schmidt
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: don't include ndisc.h from ipv6.h
2022-02-03 4:34 [PATCH net-next] net: don't include ndisc.h from ipv6.h Jakub Kicinski
` (2 preceding siblings ...)
2022-02-03 15:14 ` [PATCH net-next] " Stefan Schmidt
@ 2022-02-03 22:48 ` David Ahern
2022-02-03 23:10 ` Jakub Kicinski
3 siblings, 1 reply; 6+ messages in thread
From: David Ahern @ 2022-02-03 22:48 UTC (permalink / raw)
To: Jakub Kicinski, davem
Cc: netdev, j.vosburgh, vfalico, andy, oliver, yoshfuji, dsahern,
alex.aring, jukka.rissanen, stefan, jk, matt, linux-usb,
linux-bluetooth, linux-wpan
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;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: don't include ndisc.h from ipv6.h
2022-02-03 22:48 ` David Ahern
@ 2022-02-03 23:10 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2022-02-03 23:10 UTC (permalink / raw)
To: David Ahern
Cc: davem, netdev, j.vosburgh, vfalico, andy, oliver, yoshfuji,
dsahern, alex.aring, jukka.rissanen, stefan, jk, matt, linux-usb,
linux-bluetooth, linux-wpan
On Thu, 3 Feb 2022 15:48:28 -0700 David Ahern wrote:
> > --- 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.
Indeed, I'll post v2 with this fixed. The reason was this header
includes linux/netdevice.h so the forward declaration is unnecessary.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-03 23:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-03 4:34 [PATCH net-next] net: don't include ndisc.h from ipv6.h Jakub Kicinski
2022-02-03 4:53 ` Jeremy Kerr
2022-02-03 5:13 ` [net-next] " bluez.test.bot
2022-02-03 15:14 ` [PATCH net-next] " Stefan Schmidt
2022-02-03 22:48 ` David Ahern
2022-02-03 23:10 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.