Skip to content

Commit

Permalink
net: ipv6: squash $(ipv6-offload) in Makefile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Masahiro Yamada authored and David S. Miller committed Sep 28, 2021
1 parent d68c2e1 commit 9a12138
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions net/ipv6/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 9a12138

Please sign in to comment.