diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2021-09-27 23:28:39 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-09-28 13:13:40 +0100 |
| commit | 9a1213849a94065073b1547145c44b2605f72340 (patch) | |
| tree | 1d713afcdbf54b2e17fd684be55b292707f4590a /net/ipv6 | |
| parent | net: stmmac: fix off-by-one error in sanity check (diff) | |
| download | linux-dev-9a1213849a94065073b1547145c44b2605f72340.tar.xz linux-dev-9a1213849a94065073b1547145c44b2605f72340.zip | |
net: ipv6: squash $(ipv6-offload) in Makefile
Assign the objects directly to obj-$(CONFIG_INET).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/Makefile | 5 |
1 files 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 |