* [PATCH net-next v2] net: don't include ndisc.h from ipv6.h
@ 2022-02-03 23:12 Jakub Kicinski
2022-02-04 4:09 ` David Ahern
2022-02-05 3:50 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Jakub Kicinski @ 2022-02-03 23:12 UTC (permalink / raw)
To: davem
Cc: netdev, Jakub Kicinski, Jeremy Kerr, Stefan Schmidt, j.vosburgh,
vfalico, andy, oliver, yoshfuji, dsahern, alex.aring,
jukka.rissanen, matt, linux-usb, linux-bluetooth, linux-wpan
Nothing in ipv6.h needs ndisc.h, drop it.
Link: https://lore.kernel.org/r/20220203043457.2222388-1-kuba@kernel.org
Acked-by: Jeremy Kerr <jk@codeconstruct.com.au>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
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: 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 +
net/6lowpan/core.c | 1 +
net/ieee802154/6lowpan/core.c | 1 +
net/mctp/device.c | 1 +
7 files changed, 6 insertions(+), 1 deletion(-)
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/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] 3+ messages in thread
* Re: [PATCH net-next v2] net: don't include ndisc.h from ipv6.h
2022-02-03 23:12 [PATCH net-next v2] net: don't include ndisc.h from ipv6.h Jakub Kicinski
@ 2022-02-04 4:09 ` David Ahern
2022-02-05 3:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: David Ahern @ 2022-02-04 4:09 UTC (permalink / raw)
To: Jakub Kicinski, davem
Cc: netdev, Jeremy Kerr, Stefan Schmidt, j.vosburgh, vfalico, andy,
oliver, yoshfuji, dsahern, alex.aring, jukka.rissanen, matt,
linux-usb, linux-bluetooth, linux-wpan
On 2/3/22 4:12 PM, Jakub Kicinski wrote:
> Nothing in ipv6.h needs ndisc.h, drop it.
>
> Link: https://lore.kernel.org/r/20220203043457.2222388-1-kuba@kernel.org
> Acked-by: Jeremy Kerr <jk@codeconstruct.com.au>
> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
> 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: 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 +
> net/6lowpan/core.c | 1 +
> net/ieee802154/6lowpan/core.c | 1 +
> net/mctp/device.c | 1 +
> 7 files changed, 6 insertions(+), 1 deletion(-)
>
Reviewed-by: David Ahern <dsahern@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v2] net: don't include ndisc.h from ipv6.h
2022-02-03 23:12 [PATCH net-next v2] net: don't include ndisc.h from ipv6.h Jakub Kicinski
2022-02-04 4:09 ` David Ahern
@ 2022-02-05 3:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-02-05 3:50 UTC (permalink / raw)
To: Jakub Kicinski
Cc: davem, netdev, jk, stefan, j.vosburgh, vfalico, andy, oliver,
yoshfuji, dsahern, alex.aring, jukka.rissanen, matt, linux-usb,
linux-bluetooth, linux-wpan
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Thu, 3 Feb 2022 15:12:40 -0800 you wrote:
> Nothing in ipv6.h needs ndisc.h, drop it.
>
> Link: https://lore.kernel.org/r/20220203043457.2222388-1-kuba@kernel.org
> Acked-by: Jeremy Kerr <jk@codeconstruct.com.au>
> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
>
> [...]
Here is the summary with links:
- [net-next,v2] net: don't include ndisc.h from ipv6.h
https://git.kernel.org/netdev/net-next/c/c78b8b20e349
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-05 3:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-03 23:12 [PATCH net-next v2] net: don't include ndisc.h from ipv6.h Jakub Kicinski
2022-02-04 4:09 ` David Ahern
2022-02-05 3:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).