diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-09-27 23:28:40 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-28 13:13:40 +0100 |
| commit | 1817750bdc676bac6d1886799023b03c16e9548f (patch) | |
| tree | f91a0fcc4f62f5c79240e6655a97d84a86d1176f /net/ipv6/Makefile | |
| parent | 9a1213849a94065073b1547145c44b2605f72340 (diff) | |
| download | linux-stable-1817750bdc676bac6d1886799023b03c16e9548f.tar.gz linux-stable-1817750bdc676bac6d1886799023b03c16e9548f.tar.bz2 linux-stable-1817750bdc676bac6d1886799023b03c16e9548f.zip | |
net: ipv6: use ipv6-y directly instead of ipv6-objs
Kbuild supports <modname>-y as well as <modname>-objs.
This simplifies the Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/Makefile')
| -rw-r--r-- | net/ipv6/Makefile | 6 |
1 files 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 |