* [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile
@ 2021-09-27 14:28 Masahiro Yamada
2021-09-27 14:28 ` [PATCH 2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs Masahiro Yamada
2021-09-28 12:20 ` [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2021-09-27 14:28 UTC (permalink / raw)
To: David S . Miller, Hideaki YOSHIFUJI, David Ahern, netdev
Cc: Masahiro Yamada, Jakub Kicinski, linux-kernel
Assign the objects directly to obj-$(CONFIG_INET).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
net/ipv6/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 1bc7e143217b..061b74d5563d 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -12,8 +12,6 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \
udp_offload.o seg6.o fib6_notifier.o rpl.o ioam6.o
-ipv6-offload := ip6_offload.o tcpv6_offload.o exthdrs_offload.o
-
ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o
ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o
@@ -48,7 +46,8 @@ obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
obj-$(CONFIG_IPV6_FOU) += fou6.o
obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
-obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+obj-$(CONFIG_INET) += output_core.o protocol.o \
+ ip6_offload.o tcpv6_offload.o exthdrs_offload.o
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs
2021-09-27 14:28 [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile Masahiro Yamada
@ 2021-09-27 14:28 ` Masahiro Yamada
2021-09-28 12:20 ` [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Masahiro Yamada @ 2021-09-27 14:28 UTC (permalink / raw)
To: David S . Miller, Hideaki YOSHIFUJI, David Ahern, netdev
Cc: Masahiro Yamada, Jakub Kicinski, linux-kernel
Kbuild supports <modname>-y as well as <modname>-objs.
This simplifies the Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
net/ipv6/Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 061b74d5563d..3036a45e8a1e 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -5,14 +5,14 @@
obj-$(CONFIG_IPV6) += ipv6.o
-ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
+ipv6-y := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
addrlabel.o \
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \
raw.o icmp.o mcast.o reassembly.o tcp_ipv6.o ping.o \
exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \
udp_offload.o seg6.o fib6_notifier.o rpl.o ioam6.o
-ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o
+ipv6-$(CONFIG_SYSCTL) += sysctl_net_ipv6.o
ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
@@ -27,8 +27,6 @@ ipv6-$(CONFIG_IPV6_SEG6_HMAC) += seg6_hmac.o
ipv6-$(CONFIG_IPV6_RPL_LWTUNNEL) += rpl_iptunnel.o
ipv6-$(CONFIG_IPV6_IOAM6_LWTUNNEL) += ioam6_iptunnel.o
-ipv6-objs += $(ipv6-y)
-
obj-$(CONFIG_INET6_AH) += ah6.o
obj-$(CONFIG_INET6_ESP) += esp6.o
obj-$(CONFIG_INET6_ESP_OFFLOAD) += esp6_offload.o
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile
2021-09-27 14:28 [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile Masahiro Yamada
2021-09-27 14:28 ` [PATCH 2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs Masahiro Yamada
@ 2021-09-28 12:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-28 12:20 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: davem, yoshfuji, dsahern, netdev, kuba, linux-kernel
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Mon, 27 Sep 2021 23:28:39 +0900 you wrote:
> Assign the objects directly to obj-$(CONFIG_INET).
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> net/ipv6/Makefile | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
Here is the summary with links:
- [1/2] net: ipv6: squash $(ipv6-offload) in Makefile
https://git.kernel.org/netdev/net-next/c/9a1213849a94
- [2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs
https://git.kernel.org/netdev/net-next/c/1817750bdc67
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:[~2021-09-28 12:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-27 14:28 [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile Masahiro Yamada
2021-09-27 14:28 ` [PATCH 2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs Masahiro Yamada
2021-09-28 12:20 ` [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile 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).