From patchwork Mon Sep 27 14:28:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520069 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548FDC433EF for ; Mon, 27 Sep 2021 14:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38F59610E8 for ; Mon, 27 Sep 2021 14:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234896AbhI0Ob0 (ORCPT ); Mon, 27 Sep 2021 10:31:26 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:46932 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234706AbhI0ObX (ORCPT ); Mon, 27 Sep 2021 10:31:23 -0400 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RESscP018014; Mon, 27 Sep 2021 23:28:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RESscP018014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632752935; bh=Gjv9cJ+2iXb72Ddz9MRlVxEqBR7PSJ3W+fmsaSs4+Dg=; h=From:To:Cc:Subject:Date:From; b=riIcYJsCN2bgEfe43mHgtXRJjap8ccP9VR1t82ogzQu+wRMkHZ8/agrQY/YjsP26Z NXS9R5dKmB9GiglV5TaEPmT5txaghcWT03n0zc9lCu3mhrvA5/sDb0jgYRe//r3233 gyvQobyZGYJgq1MoD1k/OVVRn7Wlx7Q/ijC84ESLhE/IUSsOkMaR6dZxzx0sV+vzJS 20VgVUbfJhgb/b0Wk2eUexGayaWvh2i9dPnMFGSXRsFN4F9knGUY6xHy5qpsLcUeMi EzwTVUe9Z7JKHhMyJ0CZFZKQuAH7ebr1kOd4wmMNsNoSPR8JUibQCSDmDw2jb2Uai9 RU6ETgJpabSvQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: "David S . Miller" , Hideaki YOSHIFUJI , David Ahern , netdev@vger.kernel.org Cc: Masahiro Yamada , Jakub Kicinski , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: ipv6: squash $(ipv6-offload) in Makefile Date: Mon, 27 Sep 2021 23:28:39 +0900 Message-Id: <20210927142840.13286-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Assign the objects directly to obj-$(CONFIG_INET). Signed-off-by: Masahiro Yamada --- 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 From patchwork Mon Sep 27 14:28:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520067 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F735C433F5 for ; Mon, 27 Sep 2021 14:29:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A0FC610A2 for ; Mon, 27 Sep 2021 14:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234833AbhI0ObY (ORCPT ); Mon, 27 Sep 2021 10:31:24 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:46933 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234722AbhI0ObX (ORCPT ); Mon, 27 Sep 2021 10:31:23 -0400 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RESscQ018014; Mon, 27 Sep 2021 23:28:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RESscQ018014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632752935; bh=DUzwqlLK+2/bQgtMloSja7qeTr9DPQ8fH+wM1BKUl/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CxM1Sim9BaTNy9pvaNxQ9mr1evMMnaVqno9p6WELvPas8axHeEXNmIDqCWW/nBwlM L2uzSeyQecM1mAPjFxkDjYZBJgkjyBddbVaqtBfXnWQ/g9h8lm0OSJxArYzwFDS0oq JL3ThdKChDxv3GW7fgUAtzRwKbqF7fCzd4A34BlohkKjx8swQDz6jj+FOUuYkksGDM wKsN5LjqHhUqS3PL6bsGpu+9gYHnq7DCeh408tSo/591vRMgmtYPeaCzt70zSseUz4 Da39In60l87tR9dOzuXRQfCvmuAL7Ovm8a8GR1GkOOsurncUYIYK1LrIG2jDYiZYyX nxUAKmvrR9+ng== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: "David S . Miller" , Hideaki YOSHIFUJI , David Ahern , netdev@vger.kernel.org Cc: Masahiro Yamada , Jakub Kicinski , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs Date: Mon, 27 Sep 2021 23:28:40 +0900 Message-Id: <20210927142840.13286-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927142840.13286-1-masahiroy@kernel.org> References: <20210927142840.13286-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Kbuild supports -y as well as -objs. This simplifies the Makefile. Signed-off-by: Masahiro Yamada --- 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