From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B49733E3D8A for ; Tue, 17 Mar 2026 14:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756186; cv=none; b=dihhSf4ryoAoXb7luywiRlZaLOdFlJQ6dYJpbnt8TX3+nv/nJ6OKyZaQHiXDQD3LNw9QbR8eL9MOEkk6cgAyp4fr+16NU1kkkeNkXvfw4PTaNNd5RW0mcAuyJ8BXUji95m5N2bDKFVd3yAOmcGY/ZLBQRN7ZzQTGM2kbHxTmorQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756186; c=relaxed/simple; bh=4RM6pTYOevkk8GiMqDmB49lpxfjrOahHIyukcdejZzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RJtyz7NSZyMpS5DWS710GhZhTyJJWIw4iFnFNaeIpcn/1QVo7aD4fJc6v40zs76qcWaWVyLAbrPeaOWuzAsgX7Xg6e04YY2qjWZxRzjqTIxjJR0KMyeGuXnjG+z1UGE/1Eq8IanlqBdLojmbWbUrQAxqgB5Dd+d7adNpp7TXahQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2FAA65BE18; Tue, 17 Mar 2026 14:03:00 +0000 (UTC) Authentication-Results: smtp-out2.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5D5584273B; Tue, 17 Mar 2026 14:02:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sI24ExBfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:02:56 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , Krzysztof Kozlowski , Geert Uytterhoeven , Jason Gunthorpe , Leon Romanovsky , Selvin Xavier , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ido Schimmel , Petr Machata , Simon Horman , Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Nilesh Javali , Manish Rangankar , Varun Prakash , Alexander Aring , David Teigland , Andreas Gruenbacher , Nikolay Aleksandrov , David Ahern , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Howells , Marc Dionne , Marcelo Ricardo Leitner , Xin Long , Jon Maloy , Krzysztof Kozlowski , Bjorn Andersson , Arnd Bergmann , Shawn Guo , Eric Biggers , Michal Simek , Luca Weiss , Sven Peter , Lad Prabhakar , Kuninori Morimoto , Andrew Morton , Kuan-Wei Chiu , Herbert Xu , Ryota Sakamoto , Kuniyuki Iwashima , Kir Chou , David Gow , Vikas Gupta , Bhargava Marreddy , Rajashekar Hudumula , =?UTF-8?q?Markus=20Bl=C3=B6chl?= , linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-scsi@vger.kernel.org, gfs2@lists.linux.dev, bridge@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-afs@lists.infradead.org, linux-sctp@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: [PATCH 01/10 net-next v3] ipv6: convert CONFIG_IPV6 to built-in only and clean up Kconfigs Date: Tue, 17 Mar 2026 15:00:57 +0100 Message-ID: <20260317140141.5723-2-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[netdev]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Queue-Id: 2FAA65BE18 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: Maintaining a modular IPv6 stack offers image size savings for specific setups, this benefit is outweighed by the architectural burden it imposes on the subsystems on implementation and maintenance. Therefore, drop it. Change CONFIG_IPV6 from tristate to bool. Remove all Kconfig dependencies across the tree that explicitly checked for IPV6=3Dm. In addition, remove MODULE_DESCRIPTION(), MODULE_ALIAS(), MODULE_AUTHOR() and MODULE_LICENSE(). This is also replacing module_init() by device_initcall(). It is not possible to use fs_initcall() as IPv4 does because that creates a race condition on IPv6 addrconf. Finally, modify the default configs from CONFIG_IPV6=3Dm to CONFIG_IPV6=3Dy except for m68k as according to the bloat-o-meter the image is increasing by 330KB~ and that isn't acceptable. Instead, disable IPv6 on this architecture by default. This is aligned with m68k RAM requirements and recommendations [1]. [1] http://www.linux-m68k.org/faq/ram.html Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re Acked-by: Krzysztof Kozlowski --- arch/arm64/configs/defconfig | 2 +- arch/m68k/configs/amiga_defconfig | 44 +-------------------- arch/m68k/configs/apollo_defconfig | 44 +-------------------- arch/m68k/configs/atari_defconfig | 44 +-------------------- arch/m68k/configs/bvme6000_defconfig | 44 +-------------------- arch/m68k/configs/hp300_defconfig | 44 +-------------------- arch/m68k/configs/mac_defconfig | 44 +-------------------- arch/m68k/configs/multi_defconfig | 44 +-------------------- arch/m68k/configs/mvme147_defconfig | 44 +-------------------- arch/m68k/configs/mvme16x_defconfig | 44 +-------------------- arch/m68k/configs/q40_defconfig | 44 +-------------------- arch/m68k/configs/sun3_defconfig | 44 +-------------------- arch/m68k/configs/sun3x_defconfig | 44 +-------------------- drivers/infiniband/Kconfig | 1 - drivers/infiniband/hw/ocrdma/Kconfig | 2 +- drivers/infiniband/ulp/ipoib/Kconfig | 2 +- drivers/net/Kconfig | 9 ----- drivers/net/ethernet/broadcom/Kconfig | 2 +- drivers/net/ethernet/chelsio/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 - drivers/net/ethernet/netronome/Kconfig | 1 - drivers/scsi/bnx2fc/Kconfig | 1 - drivers/scsi/bnx2i/Kconfig | 1 - drivers/scsi/cxgbi/cxgb3i/Kconfig | 2 +- drivers/scsi/cxgbi/cxgb4i/Kconfig | 2 +- fs/dlm/Kconfig | 2 +- fs/gfs2/Kconfig | 2 +- net/bridge/Kconfig | 1 - net/ipv4/Kconfig | 9 ++--- net/ipv6/Kconfig | 6 +-- net/ipv6/af_inet6.c | 8 +--- net/l2tp/Kconfig | 1 - net/netfilter/Kconfig | 8 ---- net/rxrpc/Kconfig | 2 +- net/sctp/Kconfig | 1 - net/tipc/Kconfig | 1 - 36 files changed, 40 insertions(+), 557 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b67d5b1fc45b..0651a771f5c1 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -140,7 +140,7 @@ CONFIG_IP_MULTICAST=3Dy CONFIG_IP_PNP=3Dy CONFIG_IP_PNP_DHCP=3Dy CONFIG_IP_PNP_BOOTP=3Dy -CONFIG_IPV6=3Dm +CONFIG_IPV6=3Dy CONFIG_NETFILTER=3Dy CONFIG_BRIDGE_NETFILTER=3Dm CONFIG_NF_CONNTRACK=3Dm diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index 31d16cba9879..c8b936bb702f 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -72,15 +72,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -96,7 +88,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -113,7 +104,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -121,8 +111,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -197,6 +185,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -218,29 +207,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -251,7 +219,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -270,13 +237,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index c0c419ec9a9e..fc1792495bbc 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -68,15 +68,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -92,7 +84,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -109,7 +100,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -117,8 +107,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -193,6 +181,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -214,29 +203,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -247,7 +215,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -266,13 +233,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 2b7547ecc4c4..e440c596e60b 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -75,15 +75,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -99,7 +91,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -116,7 +107,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -124,8 +114,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -200,6 +188,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -221,29 +210,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -254,7 +222,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -273,13 +240,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index 0b63787cff0d..7aa352d14363 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -65,15 +65,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -89,7 +81,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -106,7 +97,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -114,8 +104,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -190,6 +178,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -211,29 +200,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -244,7 +212,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -263,13 +230,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 308836b60bba..0baaf2a82c61 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -67,15 +67,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -91,7 +83,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -108,7 +99,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -116,8 +106,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -192,6 +180,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -213,29 +202,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -246,7 +214,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -265,13 +232,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index 97e108c0d24f..0cbbfe5aeaec 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -66,15 +66,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -90,7 +82,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -107,7 +98,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -115,8 +105,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -191,6 +179,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -212,29 +201,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -245,7 +213,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -264,13 +231,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 7e9f83af9af4..2b96f90e1a4d 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -86,15 +86,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -110,7 +102,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -127,7 +118,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -135,8 +125,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -211,6 +199,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -232,29 +221,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -265,7 +233,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -284,13 +251,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 2fe33271d249..b49264cec911 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -64,15 +64,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -88,7 +80,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -105,7 +96,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -113,8 +103,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -189,6 +177,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -210,29 +199,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -243,7 +211,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -262,13 +229,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 4308daaa7f74..96a974b0a766 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -65,15 +65,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -89,7 +81,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -106,7 +97,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -114,8 +104,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -190,6 +178,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -211,29 +200,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -244,7 +212,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -263,13 +230,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index 36eb29ec54ee..e53361584393 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -66,15 +66,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -90,7 +82,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -107,7 +98,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -115,8 +105,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -191,6 +179,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -212,29 +201,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -245,7 +213,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -264,13 +231,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index 524a89fa6953..af89287c1093 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -61,15 +61,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -85,7 +77,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -102,7 +93,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -110,8 +100,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -186,6 +174,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -207,29 +196,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -240,7 +208,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -259,13 +226,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index f4fbc65c52d9..af210e8b77f9 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -62,15 +62,7 @@ CONFIG_INET_IPCOMP=3Dm CONFIG_INET_DIAG=3Dm CONFIG_INET_UDP_DIAG=3Dm CONFIG_INET_RAW_DIAG=3Dm -CONFIG_IPV6=3Dm -CONFIG_IPV6_ROUTER_PREF=3Dy -CONFIG_INET6_AH=3Dm -CONFIG_INET6_ESP=3Dm -CONFIG_INET6_ESP_OFFLOAD=3Dm -CONFIG_INET6_IPCOMP=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_VTI=3Dm -CONFIG_IPV6_GRE=3Dm +# CONFIG_IPV6 is not set CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm @@ -86,7 +78,6 @@ CONFIG_NF_CONNTRACK_SANE=3Dm CONFIG_NF_CONNTRACK_SIP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm @@ -103,7 +94,6 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REJECT=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_HASH=3Dm -CONFIG_NFT_FIB_INET=3Dm CONFIG_NFT_XFRM=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_OSF=3Dm @@ -111,8 +101,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_DUP_NETDEV=3Dm CONFIG_NFT_FWD_NETDEV=3Dm -CONFIG_NFT_FIB_NETDEV=3Dm -CONFIG_NFT_REJECT_NETDEV=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy @@ -187,6 +175,7 @@ CONFIG_IP_SET_HASH_NETNET=3Dm CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm +CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy @@ -208,29 +197,8 @@ CONFIG_IP_NF_TARGET_TTL=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm -CONFIG_NFT_DUP_IPV6=3Dm -CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dm -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_MATCH_SRH=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm -CONFIG_NFT_BRIDGE_REJECT=3Dm CONFIG_NF_CONNTRACK_BRIDGE=3Dm CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm @@ -241,7 +209,6 @@ CONFIG_BRIDGE_EBT_802_3=3Dm CONFIG_BRIDGE_EBT_AMONG=3Dm CONFIG_BRIDGE_EBT_ARP=3Dm CONFIG_BRIDGE_EBT_IP=3Dm -CONFIG_BRIDGE_EBT_IP6=3Dm CONFIG_BRIDGE_EBT_LIMIT=3Dm CONFIG_BRIDGE_EBT_MARK=3Dm CONFIG_BRIDGE_EBT_PKTTYPE=3Dm @@ -260,13 +227,6 @@ CONFIG_RDS_TCP=3Dm CONFIG_L2TP=3Dm CONFIG_BRIDGE=3Dm CONFIG_ATALK=3Dm -CONFIG_6LOWPAN=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=3Dm -CONFIG_6LOWPAN_GHC_UDP=3Dm -CONFIG_6LOWPAN_GHC_ICMPV6=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=3Dm -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=3Dm CONFIG_DNS_RESOLVER=3Dy CONFIG_BATMAN_ADV=3Dm # CONFIG_BATMAN_ADV_BATMAN_V is not set diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 78ac2ff5befd..23f4245f7d7d 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -4,7 +4,6 @@ menuconfig INFINIBAND depends on HAS_IOMEM && HAS_DMA depends on NET depends on INET - depends on m || IPV6 !=3D m depends on !ALPHA select DMA_SHARED_BUFFER select IRQ_POLL diff --git a/drivers/infiniband/hw/ocrdma/Kconfig b/drivers/infiniband/hw/o= crdma/Kconfig index 54bd70bc4d1a..b50c5f507e7c 100644 --- a/drivers/infiniband/hw/ocrdma/Kconfig +++ b/drivers/infiniband/hw/ocrdma/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config INFINIBAND_OCRDMA tristate "Emulex One Connect HCA support" - depends on ETHERNET && NETDEVICES && PCI && INET && (IPV6 || IPV6=3Dn) + depends on ETHERNET && NETDEVICES && PCI && INET select NET_VENDOR_EMULEX select BE2NET help diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/= ipoib/Kconfig index 254e31a90a66..b5253a231bdd 100644 --- a/drivers/infiniband/ulp/ipoib/Kconfig +++ b/drivers/infiniband/ulp/ipoib/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config INFINIBAND_IPOIB tristate "IP-over-InfiniBand" - depends on NETDEVICES && INET && (IPV6 || IPV6=3Dn) + depends on NETDEVICES && INET help Support for the IP-over-InfiniBand protocol (IPoIB). This transports IP packets over InfiniBand so you can use your IB diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 17108c359216..46f37ec713b8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -41,7 +41,6 @@ if NET_CORE config BONDING tristate "Bonding driver support" depends on INET - depends on IPV6 || IPV6=3Dn depends on TLS || TLS_DEVICE=3Dn help Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet @@ -75,7 +74,6 @@ config DUMMY config WIREGUARD tristate "WireGuard secure network tunnel" depends on NET && INET - depends on IPV6 || !IPV6 select NET_UDP_TUNNEL select DST_CACHE select CRYPTO_LIB_CURVE25519 @@ -105,7 +103,6 @@ config WIREGUARD_DEBUG config OVPN tristate "OpenVPN data channel offload" depends on NET && INET - depends on IPV6 || !IPV6 select DST_CACHE select NET_UDP_TUNNEL select CRYPTO @@ -202,7 +199,6 @@ config IPVLAN_L3S config IPVLAN tristate "IP-VLAN support" depends on INET - depends on IPV6 || !IPV6 help This allows one to create virtual devices off of a main interface and packets will be delivered based on the dest L3 (IPv6/IPv4 addr) @@ -249,7 +245,6 @@ config VXLAN config GENEVE tristate "Generic Network Virtualization Encapsulation" depends on INET - depends on IPV6 || !IPV6 select NET_UDP_TUNNEL select GRO_CELLS help @@ -265,7 +260,6 @@ config GENEVE config BAREUDP tristate "Bare UDP Encapsulation" depends on INET - depends on IPV6 || !IPV6 select NET_UDP_TUNNEL select GRO_CELLS help @@ -308,7 +302,6 @@ config PFCP config AMT tristate "Automatic Multicast Tunneling (AMT)" depends on INET && IP_MULTICAST - depends on IPV6 || !IPV6 select NET_UDP_TUNNEL help This allows one to create AMT(Automatic Multicast Tunneling) @@ -479,7 +472,6 @@ config NET_VRF tristate "Virtual Routing and Forwarding (Lite)" depends on IP_MULTIPLE_TABLES depends on NET_L3_MASTER_DEV - depends on IPV6 || IPV6=3Dn depends on IPV6_MULTIPLE_TABLES || IPV6=3Dn help This option enables the support for mapping interfaces into VRF's. The @@ -614,7 +606,6 @@ config NETDEVSIM tristate "Simulated networking device" depends on DEBUG_FS depends on INET - depends on IPV6 || IPV6=3Dn depends on PSAMPLE || PSAMPLE=3Dn depends on PTP_1588_CLOCK_MOCK || PTP_1588_CLOCK_MOCK=3Dn select NET_DEVLINK diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/b= roadcom/Kconfig index cd7dddeb91dd..3190231c91da 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -96,7 +96,7 @@ config BNX2 =20 config CNIC tristate "QLogic CNIC support" - depends on PCI && (IPV6 || IPV6=3Dn) + depends on PCI select BNX2 select UIO help diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/ch= elsio/Kconfig index c931ec8cac40..96d7779cd2f0 100644 --- a/drivers/net/ethernet/chelsio/Kconfig +++ b/drivers/net/ethernet/chelsio/Kconfig @@ -68,7 +68,7 @@ config CHELSIO_T3 =20 config CHELSIO_T4 tristate "Chelsio Communications T4/T5/T6 Ethernet support" - depends on PCI && (IPV6 || IPV6=3Dn) && (TLS || TLS=3Dn) + depends on PCI && (TLS || TLS=3Dn) depends on PTP_1588_CLOCK_OPTIONAL select FW_LOADER select MDIO diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig b/drivers/net/ethe= rnet/mellanox/mlxsw/Kconfig index 74f7e27b490f..2229a2694aa5 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig +++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig @@ -56,7 +56,6 @@ config MLXSW_SPECTRUM depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV && VLAN_8021Q depends on PSAMPLE || PSAMPLE=3Dn depends on BRIDGE || BRIDGE=3Dn - depends on IPV6 || IPV6=3Dn depends on NET_IPGRE || NET_IPGRE=3Dn depends on IPV6_GRE || IPV6_GRE=3Dn depends on VXLAN || VXLAN=3Dn diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/= netronome/Kconfig index d03d6e96f730..d115d16d4649 100644 --- a/drivers/net/ethernet/netronome/Kconfig +++ b/drivers/net/ethernet/netronome/Kconfig @@ -33,7 +33,6 @@ config NFP_APP_FLOWER bool "NFP4000/NFP6000 TC Flower offload support" depends on NFP depends on NET_SWITCHDEV - depends on IPV6!=3Dm || NFP=3Dm default y help Enable driver support for TC Flower offload on NFP4000 and NFP6000. diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig index 3cf7e08df809..d12eeb13384a 100644 --- a/drivers/scsi/bnx2fc/Kconfig +++ b/drivers/scsi/bnx2fc/Kconfig @@ -2,7 +2,6 @@ config SCSI_BNX2X_FCOE tristate "QLogic FCoE offload support" depends on PCI - depends on (IPV6 || IPV6=3Dn) depends on LIBFC depends on LIBFCOE select NETDEVICES diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig index 75ace2302fed..e649a04fab1d 100644 --- a/drivers/scsi/bnx2i/Kconfig +++ b/drivers/scsi/bnx2i/Kconfig @@ -3,7 +3,6 @@ config SCSI_BNX2_ISCSI tristate "QLogic NetXtreme II iSCSI support" depends on NET depends on PCI - depends on (IPV6 || IPV6=3Dn) select SCSI_ISCSI_ATTRS select NETDEVICES select ETHERNET diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/= Kconfig index e20e6f3bfe64..143e881ec77e 100644 --- a/drivers/scsi/cxgbi/cxgb3i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config SCSI_CXGB3_ISCSI tristate "Chelsio T3 iSCSI support" - depends on PCI && INET && (IPV6 || IPV6=3Dn) + depends on PCI && INET select NETDEVICES select ETHERNET select NET_VENDOR_CHELSIO diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/= Kconfig index 63c8a0f3cd0c..dd1c8ff36b00 100644 --- a/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" - depends on PCI && INET && (IPV6 || IPV6=3Dn) + depends on PCI && INET depends on PTP_1588_CLOCK_OPTIONAL depends on THERMAL || !THERMAL depends on ETHERNET diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig index b46165df5a91..fb6ba9f5a634 100644 --- a/fs/dlm/Kconfig +++ b/fs/dlm/Kconfig @@ -2,7 +2,7 @@ menuconfig DLM tristate "Distributed Lock Manager (DLM)" depends on INET - depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=3Dn) + depends on SYSFS && CONFIGFS_FS help A general purpose distributed lock manager for kernel or userspace applications. diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 7bd231d16d4a..8beee571b6af 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig @@ -26,7 +26,7 @@ config GFS2_FS =20 config GFS2_FS_LOCKING_DLM bool "GFS2 DLM locking" - depends on (GFS2_FS!=3Dn) && NET && INET && (IPV6 || IPV6=3Dn) && \ + depends on (GFS2_FS!=3Dn) && NET && INET && \ CONFIGFS_FS && SYSFS && (DLM=3Dy || DLM=3DGFS2_FS) help Multiple node locking module for GFS2 diff --git a/net/bridge/Kconfig b/net/bridge/Kconfig index 3c8ded7d3e84..318715c8fc9b 100644 --- a/net/bridge/Kconfig +++ b/net/bridge/Kconfig @@ -7,7 +7,6 @@ config BRIDGE tristate "802.1d Ethernet Bridging" select LLC select STP - depends on IPV6 || IPV6=3Dn help If you say Y here, then your Linux box will be able to act as an Ethernet bridge, which means that the different Ethernet segments it diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index df922f9f5289..21e5164e30db 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -191,7 +191,7 @@ config NET_IP_TUNNEL =20 config NET_IPGRE tristate "IP: GRE tunnels over IP" - depends on (IPV6 || IPV6=3Dn) && NET_IPGRE_DEMUX + depends on NET_IPGRE_DEMUX select NET_IP_TUNNEL help Tunneling means encapsulating data of one protocol type within @@ -303,7 +303,6 @@ config SYN_COOKIES =20 config NET_IPVTI tristate "Virtual (secure) IP: tunneling" - depends on IPV6 || IPV6=3Dn select INET_TUNNEL select NET_IP_TUNNEL select XFRM @@ -439,7 +438,7 @@ config INET_TCP_DIAG =20 config INET_UDP_DIAG tristate "UDP: socket monitoring interface" - depends on INET_DIAG && (IPV6 || IPV6=3Dn) + depends on INET_DIAG default n help Support for UDP socket monitoring interface used by the ss tool. @@ -447,7 +446,7 @@ config INET_UDP_DIAG =20 config INET_RAW_DIAG tristate "RAW: socket monitoring interface" - depends on INET_DIAG && (IPV6 || IPV6=3Dn) + depends on INET_DIAG default n help Support for RAW socket monitoring interface used by the ss tool. @@ -750,7 +749,7 @@ config TCP_AO select CRYPTO select CRYPTO_LIB_UTILS select TCP_SIGPOOL - depends on 64BIT && IPV6 !=3D m # seq-number extension needs WRITE_ONCE(u= 64) + depends on 64BIT # seq-number extension needs WRITE_ONCE(u64) help TCP-AO specifies the use of stronger Message Authentication Codes (MACs= ), protects against replays for long-lived TCP connections, and diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index b8f9a8c0302e..c024aa77f25b 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -3,9 +3,8 @@ # IPv6 configuration # =20 -# IPv6 as module will cause a CRASH if you try to unload it menuconfig IPV6 - tristate "The IPv6 protocol" + bool "The IPv6 protocol" default y select CRYPTO_LIB_SHA1 help @@ -17,9 +16,6 @@ menuconfig IPV6 Documentation/networking/ipv6.rst and read the HOWTO at =20 - To compile this protocol support as a module, choose M here: the - module will be called ipv6. - if IPV6 =20 config IPV6_ROUTER_PREF diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index eb9fff86baa1..bb29b29fdcfb 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -70,10 +70,6 @@ =20 #include "ip6_offload.h" =20 -MODULE_AUTHOR("Cast of dozens"); -MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); -MODULE_LICENSE("GPL"); - /* The inetsw6 table contains everything that inet6_create needs to * build a new socket. */ @@ -1278,6 +1274,4 @@ static int __init inet6_init(void) proto_unregister(&tcpv6_prot); goto out; } -module_init(inet6_init); - -MODULE_ALIAS_NETPROTO(PF_INET6); +device_initcall(inet6_init); diff --git a/net/l2tp/Kconfig b/net/l2tp/Kconfig index b7856748e960..0de178d5baba 100644 --- a/net/l2tp/Kconfig +++ b/net/l2tp/Kconfig @@ -5,7 +5,6 @@ =20 menuconfig L2TP tristate "Layer Two Tunneling Protocol (L2TP)" - depends on (IPV6 || IPV6=3Dn) depends on INET select NET_UDP_TUNNEL help diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 6cdc994fdc8a..f3ea0cb26f36 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -249,7 +249,6 @@ config NF_CONNTRACK_FTP =20 config NF_CONNTRACK_H323 tristate "H.323 protocol support" - depends on IPV6 || IPV6=3Dn depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most @@ -589,7 +588,6 @@ config NFT_QUOTA config NFT_REJECT default m if NETFILTER_ADVANCED=3Dn tristate "Netfilter nf_tables reject support" - depends on !NF_TABLES_INET || (IPV6!=3Dm || m) help This option adds the "reject" expression that you can use to explicitly deny and notify via TCP reset/ICMP informational errors @@ -636,7 +634,6 @@ config NFT_XFRM =20 config NFT_SOCKET tristate "Netfilter nf_tables socket match support" - depends on IPV6 || IPV6=3Dn select NF_SOCKET_IPV4 select NF_SOCKET_IPV6 if NF_TABLES_IPV6 help @@ -652,7 +649,6 @@ config NFT_OSF =20 config NFT_TPROXY tristate "Netfilter nf_tables tproxy support" - depends on IPV6 || IPV6=3Dn select NF_DEFRAG_IPV4 select NF_DEFRAG_IPV6 if NF_TABLES_IPV6 select NF_TPROXY_IPV4 @@ -1071,7 +1067,6 @@ config NETFILTER_XT_TARGET_MASQUERADE config NETFILTER_XT_TARGET_TEE tristate '"TEE" - packet cloning to alternate destination' depends on NETFILTER_ADVANCED - depends on IPV6 || IPV6=3Dn depends on !NF_CONNTRACK || NF_CONNTRACK depends on IP6_NF_IPTABLES || !IP6_NF_IPTABLES select NF_DUP_IPV4 @@ -1084,7 +1079,6 @@ config NETFILTER_XT_TARGET_TPROXY tristate '"TPROXY" target transparent proxying support' depends on NETFILTER_XTABLES depends on NETFILTER_ADVANCED - depends on IPV6 || IPV6=3Dn depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=3Dn depends on IP_NF_MANGLE || NFT_COMPAT select NF_DEFRAG_IPV4 @@ -1126,7 +1120,6 @@ config NETFILTER_XT_TARGET_SECMARK =20 config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' - depends on IPV6 || IPV6=3Dn default m if NETFILTER_ADVANCED=3Dn help This option adds a `TCPMSS' target, which allows you to alter the @@ -1581,7 +1574,6 @@ config NETFILTER_XT_MATCH_SOCKET tristate '"socket" match support' depends on NETFILTER_XTABLES depends on NETFILTER_ADVANCED - depends on IPV6 || IPV6=3Dn depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=3Dn select NF_SOCKET_IPV4 select NF_SOCKET_IPV6 if IP6_NF_IPTABLES diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig index f60b81c66078..43416b3026fb 100644 --- a/net/rxrpc/Kconfig +++ b/net/rxrpc/Kconfig @@ -25,7 +25,7 @@ if AF_RXRPC =20 config AF_RXRPC_IPV6 bool "IPv6 support for RxRPC" - depends on (IPV6 =3D m && AF_RXRPC =3D m) || (IPV6 =3D y && AF_RXRPC) + depends on IPV6 help Say Y here to allow AF_RXRPC to use IPV6 UDP as well as IPV4 UDP as its network transport. diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig index e947646a380c..fc989a3791b3 100644 --- a/net/sctp/Kconfig +++ b/net/sctp/Kconfig @@ -6,7 +6,6 @@ menuconfig IP_SCTP tristate "The SCTP Protocol" depends on INET - depends on IPV6 || IPV6=3Dn select CRYPTO_LIB_SHA1 select CRYPTO_LIB_SHA256 select CRYPTO_LIB_UTILS diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig index bb0d71eb02a6..18f62135e47b 100644 --- a/net/tipc/Kconfig +++ b/net/tipc/Kconfig @@ -6,7 +6,6 @@ menuconfig TIPC tristate "The TIPC Protocol" depends on INET - depends on IPV6 || IPV6=3Dn help The Transparent Inter Process Communication (TIPC) protocol is specially designed for intra cluster communication. This protocol --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DA5D3E5ED5 for ; Tue, 17 Mar 2026 14:03:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756195; cv=none; b=Mc0KoBdeBvDdOjj41YnN5uLutBVb3sZ5kH2GdWuINVRTirIIt5lrXx61Fo6KwrzS1oIyqUYaZ+TFj8OtrAcMzd+7/jh8rvZxRB7eSGGHuSoOqWpfimHJoYqN92Lz7ayQ81OoCaB8NjrVZkj9wFCIqzCrZgYUTIo6YZrxZ1APKLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756195; c=relaxed/simple; bh=cnIYmBGYEWbF5tAqmYCRoP38SuHi0wN8ncSK1NXKjts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TJUScEOKPvVbGIY1jed8S4Z2H9xFJrXPH0ViBXXAf8BYcaWI2mC25lehMf5uJT546JxVOHcISEaG7dwERG+zzRvDh4hfzZPa+JO/xOcKsJCBLS3Dafq8uDnsyVKcE1+oTMCDqSexaFWPhU4G2uw5e1RQgRXgWqCWn+CZiRidARI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 043705BCC9; Tue, 17 Mar 2026 14:03:12 +0000 (UTC) Authentication-Results: smtp-out2.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AECE34273B; Tue, 17 Mar 2026 14:03:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aHGaJx5fuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:10 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 02/10 net-next v3] ipv6: replace IS_BUILTIN(CONFIG_IPV6) with IS_ENABLED(CONFIG_IPV6) Date: Tue, 17 Mar 2026 15:00:58 +0100 Message-ID: <20260317140141.5723-3-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Queue-Id: 043705BCC9 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: As IPv6 is built-in only, it does not make sense to continue using IS_BUILTIN(CONFIG_IPV6). Therefore, replace it with IS_ENABLED() when necessary and drop it if it isn't valid anymore. Notice that there is still one instance related to ICMPv6, as it requires more changes it will be handle separately. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/linux/indirect_call_wrapper.h | 2 +- include/net/ip6_fib.h | 2 +- net/core/filter.c | 14 +++++++------- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6_offload.c | 4 ++-- net/ipv6/route.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/indirect_call_wrapper.h b/include/linux/indirect= _call_wrapper.h index dc272b514a01..0e4340ecd857 100644 --- a/include/linux/indirect_call_wrapper.h +++ b/include/linux/indirect_call_wrapper.h @@ -57,7 +57,7 @@ * builtin, this macro simplify dealing with indirect calls with only ipv4= /ipv6 * alternatives */ -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) #define INDIRECT_CALL_INET(f, f2, f1, ...) \ INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__) #elif IS_ENABLED(CONFIG_INET) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 88b0dd4d8e09..39c98c3d8ac5 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -580,7 +580,7 @@ static inline bool fib6_metric_locked(struct fib6_info = *f6i, int metric) void fib6_info_hw_flags_set(struct net *net, struct fib6_info *f6i, bool offload, bool trap, bool offload_failed); =20 -#if IS_BUILTIN(CONFIG_IPV6) && defined(CONFIG_BPF_SYSCALL) +#if IS_ENABLED(CONFIG_IPV6) && defined(CONFIG_BPF_SYSCALL) struct bpf_iter__ipv6_route { __bpf_md_ptr(struct bpf_iter_meta *, meta); __bpf_md_ptr(struct fib6_info *, rt); diff --git a/net/core/filter.c b/net/core/filter.c index 2f023999f046..c56821afaa0f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7590,7 +7590,7 @@ BPF_CALL_5(bpf_tcp_check_syncookie, struct sock *, sk= , void *, iph, u32, iph_len ret =3D __cookie_v4_check((struct iphdr *)iph, th); break; =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) case 6: if (unlikely(iph_len < sizeof(struct ipv6hdr))) return -EINVAL; @@ -7660,7 +7660,7 @@ BPF_CALL_5(bpf_tcp_gen_syncookie, struct sock *, sk, = void *, iph, u32, iph_len, mss =3D tcp_v4_get_syncookie(sk, iph, th, &cookie); break; =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) case 6: if (unlikely(iph_len < sizeof(struct ipv6hdr))) return -EINVAL; @@ -8026,7 +8026,7 @@ static const struct bpf_func_proto bpf_tcp_raw_gen_sy= ncookie_ipv4_proto =3D { BPF_CALL_3(bpf_tcp_raw_gen_syncookie_ipv6, struct ipv6hdr *, iph, struct tcphdr *, th, u32, th_len) { -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) const u16 mss_clamp =3D IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr); u32 cookie; @@ -8078,7 +8078,7 @@ static const struct bpf_func_proto bpf_tcp_raw_check_= syncookie_ipv4_proto =3D { BPF_CALL_2(bpf_tcp_raw_check_syncookie_ipv6, struct ipv6hdr *, iph, struct tcphdr *, th) { -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) if (__cookie_v6_check(iph, th) > 0) return 0; =20 @@ -11964,7 +11964,7 @@ BPF_CALL_1(bpf_skc_to_tcp_timewait_sock, struct soc= k *, sk) return (unsigned long)sk; #endif =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) if (sk && sk->sk_prot =3D=3D &tcpv6_prot && sk->sk_state =3D=3D TCP_TIME_= WAIT) return (unsigned long)sk; #endif @@ -11987,7 +11987,7 @@ BPF_CALL_1(bpf_skc_to_tcp_request_sock, struct sock= *, sk) return (unsigned long)sk; #endif =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) if (sk && sk->sk_prot =3D=3D &tcpv6_prot && sk->sk_state =3D=3D TCP_NEW_S= YN_RECV) return (unsigned long)sk; #endif @@ -12250,7 +12250,7 @@ __bpf_kfunc int bpf_sk_assign_tcp_reqsk(struct __sk= _buff *s, struct sock *sk, ops =3D &tcp_request_sock_ops; min_mss =3D 536; break; -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): ops =3D &tcp6_request_sock_ops; min_mss =3D IPV6_MIN_MTU - 60; diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index a6e58a435735..0fc6ef4a48b1 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -2763,7 +2763,7 @@ static void ipv6_route_native_seq_stop(struct seq_fil= e *seq, void *v) rcu_read_unlock(); } =20 -#if IS_BUILTIN(CONFIG_IPV6) && defined(CONFIG_BPF_SYSCALL) +#if IS_ENABLED(CONFIG_IPV6) && defined(CONFIG_BPF_SYSCALL) static int ipv6_route_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta *meta, void *v) diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index bd7f780e37a5..d8072ad6b8c4 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -286,7 +286,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receiv= e(struct list_head *head, =20 if (likely(proto =3D=3D IPPROTO_TCP)) pp =3D tcp6_gro_receive(head, skb); -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) else if (likely(proto =3D=3D IPPROTO_UDP)) pp =3D udp6_gro_receive(head, skb); #endif @@ -346,7 +346,7 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk= _buff *skb, int nhoff) =20 if (likely(ops =3D=3D &net_hotdata.tcpv6_offload)) return tcp6_gro_complete(skb, nhoff); -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) if (ops =3D=3D &net_hotdata.udpv6_offload) return udp6_gro_complete(skb, nhoff); #endif diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 08cd86f49bf9..e206777785d4 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -6826,7 +6826,7 @@ void __init ip6_route_init_special_entries(void) #endif } =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) DEFINE_BPF_ITER_FUNC(ipv6_route, struct bpf_iter_meta *meta, struct fib6_i= nfo *rt) =20 @@ -6921,7 +6921,7 @@ int __init ip6_route_init(void) if (ret) goto out_register_late_subsys; =20 -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) ret =3D bpf_iter_register(); if (ret) @@ -6961,7 +6961,7 @@ int __init ip6_route_init(void) =20 void ip6_route_cleanup(void) { -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) bpf_iter_unregister(); #endif --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 073703A5E7F for ; Tue, 17 Mar 2026 14:03:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756205; cv=none; b=mHK5sLF3gjgskTnoCOy1TFzEvyI5nx/6MlOKptdJ06BcyV+ahIVmR4oAHIx1iXSUzE1msdh492vk9TmXCe/TI3UfzUSkSEUqPmsdQciORpOwU+FEqUEiX7NMglUVSdMay+pywM1UL2ptAmGBFGUicAMUrlxIY13wEieWbFMXPEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756205; c=relaxed/simple; bh=1yg+56+zL08xdgxP9319hRsBmG99D7wudbbYqE29Qvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o2j7eptyhE3zmv6KxdQ9d4BDi8x/O36SYzu5ej5v8nYZrEz56MTo1gBGPnI2QpqZ2km5zSMjmlUBbZ/BmtNVHk1sSLtlqgHXJ0/6X8hknG39iksfVHOQjj3qNNzQYZV9kuwnzXvO0WyAHxthnABeDvIDWamq1oeTJS6vt1lbGGA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=l0wCmOlr; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=XMkHn9T7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=lKrz5YZp; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=jmEIDN1E; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="l0wCmOlr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="XMkHn9T7"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="lKrz5YZp"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="jmEIDN1E" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4A8C34D341; Tue, 17 Mar 2026 14:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756202; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TT44rZWN4O5gFdBieL0cqH0MkqBMZobi/7dsBgZBh28=; b=l0wCmOlrIYAxyzBvmIl09IqeDjtu4Jw0M3oIoi6Vx4t0YISiV5/O3uv00Z67Ntu7mqXrx4 tlTs8mrI8D9vkzPd36UAX5Q9MBudEv2zN9iMw3644wGDuVRTMeDUNG8WClhDSXiaBo6In2 ljZhnuVZNw3UBkuhRE5Zq/WIVB+7c4U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756202; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TT44rZWN4O5gFdBieL0cqH0MkqBMZobi/7dsBgZBh28=; b=XMkHn9T77H9T0bG729nxILN9x6dDmqdFz0K4XLwxrG1/YFWy62P6T17daScILAhE9ispNX iuHtTKbyVQPEI4Cg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756199; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TT44rZWN4O5gFdBieL0cqH0MkqBMZobi/7dsBgZBh28=; b=lKrz5YZpMha41baDz3HVxAj9we69IJZF+8vYQEfIy5PEIEtZqH/bK6D8LBp6U5ZAM3JnqK dJj8yiV7CMyxr7YDCy4nOtV0SUb0eKMQj+K1p645uc/7dp0TFvgk6tcjuzkhCZssTT5g+d qnRkhZMsVF9m9/DwCuoL53bY8tXgqMg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756199; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TT44rZWN4O5gFdBieL0cqH0MkqBMZobi/7dsBgZBh28=; b=jmEIDN1EO2Ba2jaUT2baE8tvOSVI2+3O90EBApzfQ08tWoGsprwxlYsRAzDWNASf++V0EK rYrUcdQNWxxlP5Dg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A7B924273B; Tue, 17 Mar 2026 14:03:18 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id mBjyJSZfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:18 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org Subject: [PATCH 03/10 net-next v3] ipv6: remove dynamic ICMPv6 sender registration infrastructure Date: Tue, 17 Mar 2026 15:00:59 +0100 Message-ID: <20260317140141.5723-4-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -7.30 X-Spam-Level: X-Spamd-Result: default: False [-7.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[10]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; SEM_URIBL_FRESH15_UNKNOWN_FAIL(0.00)[suse.com:server fail]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.de:mid,suse.de:email] X-Spam-Flag: NO As IPv6 is built-in only, there is no need to maintain the sender registration infrastructure used to allow built-in subsystems to send ICMPv6 messages when IPv6 was compiled as a module. Drop the registration mechanism and the __icmpv6_send() sender implementation. While icmpv6_send() users could be converted to icmp6_send() that doesn't seems necessary as none of them are using the force_saddr parameter. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/linux/icmpv6.h | 26 ++---------------------- net/ipv6/icmp.c | 6 ------ net/ipv6/ip6_icmp.c | 46 +++--------------------------------------- 3 files changed, 5 insertions(+), 73 deletions(-) diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index e3b3b0fa2a8f..bb000dc571f0 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -21,32 +21,10 @@ typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 ty= pe, u8 code, __u32 info, void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, const struct in6_addr *force_saddr, const struct inet6_skb_parm *parm); -#if IS_BUILTIN(CONFIG_IPV6) -static inline void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __= u32 info, - const struct inet6_skb_parm *parm) -{ - icmp6_send(skb, type, code, info, NULL, parm); -} -static inline int inet6_register_icmp_sender(ip6_icmp_send_t *fn) -{ - BUILD_BUG_ON(fn !=3D icmp6_send); - return 0; -} -static inline int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn) -{ - BUILD_BUG_ON(fn !=3D icmp6_send); - return 0; -} -#else -extern void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 inf= o, - const struct inet6_skb_parm *parm); -extern int inet6_register_icmp_sender(ip6_icmp_send_t *fn); -extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn); -#endif =20 static inline void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u3= 2 info) { - __icmpv6_send(skb, type, code, info, IP6CB(skb)); + icmp6_send(skb, type, code, info, NULL, IP6CB(skb)); } =20 int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type, @@ -58,7 +36,7 @@ void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 = code, __u32 info); static inline void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 cod= e, __u32 info) { struct inet6_skb_parm parm =3D { 0 }; - __icmpv6_send(skb_in, type, code, info, &parm); + icmp6_send(skb_in, type, code, info, NULL, &parm); } #endif =20 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 813d2e9edb8b..8e8d7bd84a4c 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -1288,13 +1288,8 @@ int __init icmpv6_init(void) if (inet6_add_protocol(&icmpv6_protocol, IPPROTO_ICMPV6) < 0) goto fail; =20 - err =3D inet6_register_icmp_sender(icmp6_send); - if (err) - goto sender_reg_err; return 0; =20 -sender_reg_err: - inet6_del_protocol(&icmpv6_protocol, IPPROTO_ICMPV6); fail: pr_err("Failed to register ICMP6 protocol\n"); return err; @@ -1302,7 +1297,6 @@ int __init icmpv6_init(void) =20 void icmpv6_cleanup(void) { - inet6_unregister_icmp_sender(icmp6_send); inet6_del_protocol(&icmpv6_protocol, IPPROTO_ICMPV6); } =20 diff --git a/net/ipv6/ip6_icmp.c b/net/ipv6/ip6_icmp.c index 233914b63bdb..e43ea9492332 100644 --- a/net/ipv6/ip6_icmp.c +++ b/net/ipv6/ip6_icmp.c @@ -7,47 +7,8 @@ =20 #include =20 -#if IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) && IS_ENABLED(CONFIG_NF_NAT) =20 -#if !IS_BUILTIN(CONFIG_IPV6) - -static ip6_icmp_send_t __rcu *ip6_icmp_send; - -int inet6_register_icmp_sender(ip6_icmp_send_t *fn) -{ - return (cmpxchg((ip6_icmp_send_t **)&ip6_icmp_send, NULL, fn) =3D=3D NULL= ) ? - 0 : -EBUSY; -} -EXPORT_SYMBOL(inet6_register_icmp_sender); - -int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn) -{ - int ret; - - ret =3D (cmpxchg((ip6_icmp_send_t **)&ip6_icmp_send, fn, NULL) =3D=3D fn)= ? - 0 : -EINVAL; - - synchronize_net(); - - return ret; -} -EXPORT_SYMBOL(inet6_unregister_icmp_sender); - -void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, - const struct inet6_skb_parm *parm) -{ - ip6_icmp_send_t *send; - - rcu_read_lock(); - send =3D rcu_dereference(ip6_icmp_send); - if (send) - send(skb, type, code, info, NULL, parm); - rcu_read_unlock(); -} -EXPORT_SYMBOL(__icmpv6_send); -#endif - -#if IS_ENABLED(CONFIG_NF_NAT) #include void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info) { @@ -60,7 +21,7 @@ void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 = code, __u32 info) =20 ct =3D nf_ct_get(skb_in, &ctinfo); if (!ct || !(READ_ONCE(ct->status) & IPS_NAT_MASK)) { - __icmpv6_send(skb_in, type, code, info, &parm); + icmp6_send(skb_in, type, code, info, NULL, &parm); return; } =20 @@ -76,11 +37,10 @@ void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u= 8 code, __u32 info) orig_ip =3D ipv6_hdr(skb_in)->saddr; dir =3D CTINFO2DIR(ctinfo); ipv6_hdr(skb_in)->saddr =3D ct->tuplehash[dir].tuple.src.u3.in6; - __icmpv6_send(skb_in, type, code, info, &parm); + icmp6_send(skb_in, type, code, info, NULL, &parm); ipv6_hdr(skb_in)->saddr =3D orig_ip; out: consume_skb(cloned_skb); } EXPORT_SYMBOL(icmpv6_ndo_send); #endif -#endif --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC46A3E5ED5 for ; Tue, 17 Mar 2026 14:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756209; cv=none; b=l2b/HT1zAoa2sERhSOYg/LwxIlKc1xxc7cTInwVLWHIIZSQh2KbLlYlwp0zJGFEyYAnfbFAq8iDEQPqalvwaiqLmHwvvktBsTYKpXd5XYHT9C0GzkDxVWD20iznXmfosyJtEcYlyuAgCF7aZr1MH6I3dN2OE64SX2lVC7PgITZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756209; c=relaxed/simple; bh=gJat9vltMTb74jlqY6V4kCMB3tDnjFb5AcNadu1XYEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gv/I7mavyrfOQAWlUT1TZ+S+cbbkSFeQ2dHw6QYsBgzvGJYe/0SLYC5wzshAPi5RtGafd5T2T/MlhObPmsVZSmydoMrmAaJwNrYk4vkZB/h4akvKIP45Oq5Uyv90ao6FU5uDVyKigho/V0ItPfutI5VVduSj1HXBCnRHC4RzF3c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 594E25BE0D; Tue, 17 Mar 2026 14:03:25 +0000 (UTC) Authentication-Results: smtp-out2.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B4A464273B; Tue, 17 Mar 2026 14:03:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id eKQPKSxfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:24 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org Subject: [PATCH 04/10 net-next v3] ipv6: prepare headers for ipv6_stub removal Date: Tue, 17 Mar 2026 15:01:00 +0100 Message-ID: <20260317140141.5723-5-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 594E25BE0D X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Score: -4.00 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org In preparation for dropping ipv6_stub and converting its users to direct function calls, introduce static inline dummy functions and fallback macros in the IPv6 networking headers. These fallbacks ensure that when CONFIG_IPV6 is completely disabled, there are no compiling or linking errors due to code paths not guarded by preprocessor macro IS_ENABLED(CONFIG_IPV6). In addition, export ndisc_send_na(), ip6_route_input() and ip6_fragment(). Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/net/ip6_fib.h | 32 ++++++++++++++++++++++++++++++++ include/net/ip6_route.h | 26 ++++++++++++++++++++++++++ include/net/ipv6.h | 10 ++++++++++ include/net/ndisc.h | 13 ++++++++++++- net/ipv6/ip6_output.c | 1 + net/ipv6/ndisc.c | 1 + net/ipv6/route.c | 1 + 7 files changed, 83 insertions(+), 1 deletion(-) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 39c98c3d8ac5..1705cd6aab18 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -486,11 +486,30 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struc= t in6_addr *addr) rcu_read_unlock(); } =20 +#if IS_ENABLED(CONFIG_IPV6) int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack); void fib6_nh_release(struct fib6_nh *fib6_nh); void fib6_nh_release_dsts(struct fib6_nh *fib6_nh); +#else +static inline int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, + struct fib6_config *cfg, gfp_t gfp_flags, + struct netlink_ext_ack *extack) +{ + NL_SET_ERR_MSG(extack, "IPv6 support not enabled in kernel"); + return -EAFNOSUPPORT; +} + +static inline void fib6_nh_release(struct fib6_nh *fib6_nh) +{ +} + +static inline void fib6_nh_release_dsts(struct fib6_nh *fib6_nh) +{ +} +#endif + =20 int call_fib6_entry_notifiers(struct net *net, enum fib_event_type event_type, @@ -502,8 +521,15 @@ int call_fib6_multipath_entry_notifiers(struct net *ne= t, unsigned int nsiblings, struct netlink_ext_ack *extack); int call_fib6_entry_notifiers_replace(struct net *net, struct fib6_info *r= t); +#if IS_ENABLED(CONFIG_IPV6) void fib6_rt_update(struct net *net, struct fib6_info *rt, struct nl_info *info); +#else +static inline void fib6_rt_update(struct net *net, struct fib6_info *rt, + struct nl_info *info) +{ +} +#endif void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info, unsigned int flags); =20 @@ -568,7 +594,13 @@ unsigned int fib6_tables_seq_read(const struct net *ne= t); int fib6_tables_dump(struct net *net, struct notifier_block *nb, struct netlink_ext_ack *extack); =20 +#if IS_ENABLED(CONFIG_IPV6) void fib6_update_sernum(struct net *net, struct fib6_info *rt); +#else +static inline void fib6_update_sernum(struct net *net, struct fib6_info *r= t) +{ +} +#endif void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt); void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i); =20 diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 0c8eeb6abe7a..09ffe0f13ce7 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -77,7 +77,14 @@ static inline bool rt6_qualify_for_ecmp(const struct fib= 6_info *f6i) f6i->fib6_nh->fib_nh_gw_family; } =20 +#if IS_ENABLED(CONFIG_IPV6) void ip6_route_input(struct sk_buff *skb); +#else +static inline void ip6_route_input(struct sk_buff *skb) +{ +} +#endif + struct dst_entry *ip6_route_input_lookup(struct net *net, struct net_device *dev, struct flowi6 *fl6, @@ -119,7 +126,15 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack); int ip6_ins_rt(struct net *net, struct fib6_info *f6i); +#if IS_ENABLED(CONFIG_IPV6) int ip6_del_rt(struct net *net, struct fib6_info *f6i, bool skip_notify); +#else +static inline int ip6_del_rt(struct net *net, struct fib6_info *f6i, + bool skip_notify) +{ + return -EAFNOSUPPORT; +} +#endif =20 void rt6_flush_exceptions(struct fib6_info *f6i); void rt6_age_exceptions(struct fib6_info *f6i, struct fib6_gc_args *gc_arg= s, @@ -270,8 +285,19 @@ static inline bool ipv6_anycast_destination(const stru= ct dst_entry *dst, return __ipv6_anycast_destination(&rt->rt6i_dst, rt->rt6i_flags, daddr); } =20 +#if IS_ENABLED(CONFIG_IPV6) int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, int (*output)(struct net *, struct sock *, struct sk_buff *)); +#else +static inline int ip6_fragment(struct net *net, struct sock *sk, + struct sk_buff *skb, + int (*output)(struct net *, struct sock *, + struct sk_buff *)) +{ + kfree_skb(skb); + return -EAFNOSUPPORT; +} +#endif =20 /* Variant of dst_mtu() for IPv6 users */ static inline u32 dst6_mtu(const struct dst_entry *dst) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 0958cc5c6ec3..f99f273341f0 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1044,8 +1044,18 @@ static inline struct sk_buff *ip6_finish_skb(struct = sock *sk) =20 int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **ds= t, struct flowi6 *fl6); +#if IS_ENABLED(CONFIG_IPV6) struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *= sk, struct flowi6 *fl6, const struct in6_addr *final_dst); +#else +static inline struct dst_entry *ip6_dst_lookup_flow(struct net *net, const= struct sock *sk, + struct flowi6 *fl6, + const struct in6_addr *final_dst) +{ + return ERR_PTR(-EAFNOSUPPORT); +} +#endif + struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *f= l6, const struct in6_addr *final_dst, bool connected); diff --git a/include/net/ndisc.h b/include/net/ndisc.h index d38783a2ce57..6152401f29f1 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -69,6 +69,12 @@ struct prefix_info; =20 extern struct neigh_table nd_tbl; =20 +#if IS_ENABLED(CONFIG_IPV6) +#define ipv6_get_nd_tbl() (&nd_tbl) +#else +#define ipv6_get_nd_tbl() NULL +#endif + struct nd_msg { struct icmp6hdr icmph; struct in6_addr target; @@ -356,7 +362,8 @@ static inline u32 ndisc_hashfn(const void *pkey, const = struct net_device *dev, _ =20 static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_devic= e *dev, const void *pkey) { - return ___neigh_lookup_noref(&nd_tbl, neigh_key_eq128, ndisc_hashfn, pkey= , dev); + return ___neigh_lookup_noref(ipv6_get_nd_tbl(), neigh_key_eq128, + ndisc_hashfn, pkey, dev); } =20 static inline @@ -406,6 +413,7 @@ static inline void __ipv6_confirm_neigh_stub(struct net= _device *dev, static inline struct neighbour *ip_neigh_gw6(struct net_device *dev, const void *addr) { +#if IS_ENABLED(CONFIG_IPV6) struct neighbour *neigh; =20 neigh =3D __ipv6_neigh_lookup_noref_stub(dev, addr); @@ -413,6 +421,9 @@ static inline struct neighbour *ip_neigh_gw6(struct net= _device *dev, neigh =3D __neigh_create(ipv6_stub->nd_tbl, addr, dev, false); =20 return neigh; +#else + return ERR_PTR(-EAFNOSUPPORT); +#endif } =20 int ndisc_init(void); diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8e2a6b28cea7..315808dc2a07 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1045,6 +1045,7 @@ int ip6_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, kfree_skb(skb); return err; } +EXPORT_SYMBOL_GPL(ip6_fragment); =20 static inline int ip6_rt_check(const struct rt6key *rt_key, const struct in6_addr *fl_addr, diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index f6a5d8c73af9..f76fb8a85452 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -576,6 +576,7 @@ void ndisc_send_na(struct net_device *dev, const struct= in6_addr *daddr, =20 ndisc_send_skb(skb, daddr, src_addr); } +EXPORT_SYMBOL_GPL(ndisc_send_na); =20 static void ndisc_send_unsol_na(struct net_device *dev) { diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e206777785d4..b66a2f791e3f 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2655,6 +2655,7 @@ void ip6_route_input(struct sk_buff *skb) skb_dst_set_noref(skb, ip6_route_input_lookup(net, skb->dev, &fl6, skb, flags)); } +EXPORT_SYMBOL_GPL(ip6_route_input); =20 INDIRECT_CALLABLE_SCOPE struct rt6_info *ip6_pol_route_output(struct net *= net, struct fib6_table *table, --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CA973E4C86 for ; Tue, 17 Mar 2026 14:03:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756237; cv=none; b=qBiqYIMKH424KRQBfh9rOGputKdfjWAsU2ubeLcV5hKVfrP/IfYXfaprCwZxpHKFeyWRu9xyWvhveB2jbaPo0pChjArVRAir5YXkT81gu1aW4H/GRXtZT7PIC0E9ZvrADL30kCvBUZcHKrDbaSQOZCEO8kSra1RQ/5oSgIUs9IQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756237; c=relaxed/simple; bh=dCSQSXrKGQoAUvW5WVdilFHh88vpFe8J+SDoNANzihE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WqRNFz2+KYLZsXFW1Gsd+ILD+lE6MzbZCSL0+orrdht96OUkwp7KgFUurKFEqbjcDpOn2Oo9F3FacmvZZE1tQVFuINWvLjeZQoYr6ed7RvLYpezssUK7vwkcXEFJJRsPnZby3BiarSSeb5E/jHh7kRMhxoBYG0K+7YugHVR2u0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Ebz/G3R+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=bY/Sxi5Z; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=hZgmHstn; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rJ/vBunS; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Ebz/G3R+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bY/Sxi5Z"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="hZgmHstn"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rJ/vBunS" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E5B055BE0D; Tue, 17 Mar 2026 14:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756224; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjJG4+eBf234gf25TIf5S+ExqzLP/QpJradFvOgQTdE=; b=Ebz/G3R+uFTlL1jKI4o/k3zoo1EFr3pJws2qzVb3XsS1QrIydmD4MvCuUGhyb3f3ZFBaB5 V77sNNbVSRwR9ICGsAe2wMZVuKMNtXT+tctFXIqFUJH9vUM9+dg35BOuh8BvnpuRAZP8Li Z0kADZyhbf/ifvuCW7W632cDC+/YKew= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756224; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjJG4+eBf234gf25TIf5S+ExqzLP/QpJradFvOgQTdE=; b=bY/Sxi5Z+mgIke4KMYiPhnm1/QC0bmPykDEgY2IeO0/f9pYrDgPKPxfebx/U7r5kb2lqrf 26+n+6ljkRad/0CA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756219; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjJG4+eBf234gf25TIf5S+ExqzLP/QpJradFvOgQTdE=; b=hZgmHstnhJWf3r2ke5rsOqUvJpVU7bbKmu3Dv/wkDOfrKGniV+C5UPLcTbe6I1PawXm0nb s7n1Gy3rmrUqzM/sZd7Q/GJvzdAtb7qVXqc+Y3JzX/hNygoxiM3inY6y2/Thtm7fV1Hd4+ MEOGnWq6EMoL2J7aHtgrUQKbnzb46Wo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756219; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjJG4+eBf234gf25TIf5S+ExqzLP/QpJradFvOgQTdE=; b=rJ/vBunS9I2TjiUZSPBAuvuyUOex2M28ZCLz6lYHyP+bf2fV2pQBSogZ82OXHuCwbHf29S GRKrjInR9XU14aDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4A8344273B; Tue, 17 Mar 2026 14:03:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QK4gDzlfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:37 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "Jason A. Donenfeld" , Antonio Quartulli , Edward Cree , Jason Gunthorpe , Leon Romanovsky , Zhu Yanjun , Saeed Mahameed , Tariq Toukan , Mark Bloch , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Boris Pismenny , Ido Schimmel , Petr Machata , Simon Horman , Pablo Neira Ayuso , Harald Welte , Sabrina Dubroca , Oliver Neukum , David Ahern , Stanislav Yakovlev , Nikolay Aleksandrov , Vlad Dumitrescu , Edward Srouji , Parav Pandit , Kees Cook , Guillaume Nault , Jianbo Liu , Gal Pressman , Alexei Lazar , Cosmin Ratiu , Carolina Jubran , Alexandre Cassen , Stanislav Fomichev , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-net-drivers@amd.com, osmocom-net-gprs@lists.osmocom.org, linux-usb@vger.kernel.org, wireguard@lists.zx2c4.com, linux-wireless@vger.kernel.org, bridge@lists.linux.dev Subject: [PATCH 05/10 net-next v3] drivers: net: drop ipv6_stub usage and use direct function calls Date: Tue, 17 Mar 2026 15:01:01 +0100 Message-ID: <20260317140141.5723-6-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-5.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[49]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; SEM_URIBL_FRESH15_UNKNOWN_FAIL(0.00)[openvpn.net:query timed out,zx2c4.com:query timed out]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[suse.de,suse.com,zx2c4.com,openvpn.net,gmail.com,ziepe.ca,kernel.org,nvidia.com,lunn.ch,davemloft.net,google.com,redhat.com,netfilter.org,gnumonks.org,queasysnail.net,neukum.org,blackwall.org,corp.free.fr,fomichev.me,vger.kernel.org,corigine.com,amd.com,lists.osmocom.org,lists.zx2c4.com,lists.linux.dev]; RCVD_COUNT_TWO(0.00)[2]; TAGGED_RCPT(0.00)[netdev]; SEM_URIBL_UNKNOWN_FAIL(0.00)[suse.de:server fail,zx2c4.com:query timed out,openvpn.net:query timed out]; R_RATELIMIT(0.00)[to_ip_from(RLebtgy37wakf4cwfdza4jg1hg)]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email,suse.com:email,openvpn.net:email,zx2c4.com:email] X-Spam-Flag: NO X-Spam-Score: -5.80 X-Spam-Level: As IPv6 is built-in only, the ipv6_stub infrastructure is no longer necessary. Convert all drivers currently utilizing ipv6_stub to make direct function calls. The fallback functions introduced previously will prevent linkage errors when CONFIG_IPV6 is disabled. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re Reviewed-by: Jason A. Donenfeld Reviewed-by: Antonio Quartulli Reviewed-by: Edward Cree --- drivers/infiniband/core/addr.c | 3 +-- drivers/infiniband/sw/rxe/rxe_net.c | 6 +++--- .../ethernet/mellanox/mlx5/core/en/rep/neigh.c | 12 ++++++++---- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 3 +-- .../mellanox/mlx5/core/en/tc_tun_encap.c | 2 +- .../mellanox/mlx5/core/en_accel/ipsec.c | 1 - .../net/ethernet/mellanox/mlx5/core/en_rep.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 - .../ethernet/mellanox/mlxsw/spectrum_router.c | 9 +++++---- .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 ++- .../net/ethernet/netronome/nfp/flower/action.c | 2 +- .../ethernet/netronome/nfp/flower/tunnel_conf.c | 9 ++++----- drivers/net/ethernet/sfc/tc_counters.c | 2 +- drivers/net/ethernet/sfc/tc_encap_actions.c | 5 ++--- drivers/net/geneve.c | 1 - drivers/net/gtp.c | 2 +- drivers/net/ovpn/peer.c | 3 +-- drivers/net/ovpn/udp.c | 3 +-- drivers/net/usb/cdc_mbim.c | 17 +++++++++-------- drivers/net/vrf.c | 3 ++- drivers/net/vxlan/vxlan_core.c | 11 +++++------ drivers/net/vxlan/vxlan_multicast.c | 6 ++---- drivers/net/wireguard/socket.c | 3 +-- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- net/bridge/br_arp_nd_proxy.c | 3 +-- 25 files changed, 53 insertions(+), 60 deletions(-) diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index 866746695712..48d4b06384ec 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -411,7 +410,7 @@ static int addr6_resolve(struct sockaddr *src_sock, fl6.saddr =3D src_in->sin6_addr; fl6.flowi6_oif =3D addr->bound_dev_if; =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL); + dst =3D ip6_dst_lookup_flow(addr->net, NULL, &fl6, NULL); if (IS_ERR(dst)) return PTR_ERR(dst); =20 diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rx= e/rxe_net.c index 0bd0902b11f7..cbc646a30003 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -138,9 +138,9 @@ static struct dst_entry *rxe_find_route6(struct rxe_qp = *qp, memcpy(&fl6.daddr, daddr, sizeof(*daddr)); fl6.flowi6_proto =3D IPPROTO_UDP; =20 - ndst =3D ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk), - recv_sockets.sk6->sk, &fl6, - NULL); + ndst =3D ip6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk), + recv_sockets.sk6->sk, &fl6, + NULL); if (IS_ERR(ndst)) { rxe_dbg_qp(qp, "no route to %pI6\n", daddr); return NULL; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c b/drive= rs/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c index d220b045b331..56930bad94eb 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "neigh.h" #include "tc.h" #include "en_rep.h" @@ -18,8 +19,10 @@ =20 static unsigned long mlx5e_rep_ipv6_interval(void) { - if (IS_ENABLED(CONFIG_IPV6) && ipv6_stub->nd_tbl) - return NEIGH_VAR(&ipv6_stub->nd_tbl->parms, DELAY_PROBE_TIME); + struct neigh_table *tbl =3D ipv6_get_nd_tbl(); + + if (IS_ENABLED(CONFIG_IPV6) && ipv6_mod_enabled()) + return NEIGH_VAR(&tbl->parms, DELAY_PROBE_TIME); =20 return ~0UL; } @@ -217,7 +220,7 @@ static int mlx5e_rep_netevent_event(struct notifier_blo= ck *nb, case NETEVENT_NEIGH_UPDATE: n =3D ptr; #if IS_ENABLED(CONFIG_IPV6) - if (n->tbl !=3D ipv6_stub->nd_tbl && n->tbl !=3D &arp_tbl) + if (n->tbl !=3D ipv6_get_nd_tbl() && n->tbl !=3D &arp_tbl) #else if (n->tbl !=3D &arp_tbl) #endif @@ -238,7 +241,8 @@ static int mlx5e_rep_netevent_event(struct notifier_blo= ck *nb, * done per device delay prob time parameter. */ #if IS_ENABLED(CONFIG_IPV6) - if (!p->dev || (p->tbl !=3D ipv6_stub->nd_tbl && p->tbl !=3D &arp_tbl)) + if (!p->dev || + (p->tbl !=3D ipv6_get_nd_tbl() && p->tbl !=3D &arp_tbl)) #else if (!p->dev || p->tbl !=3D &arp_tbl) #endif diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/= net/ethernet/mellanox/mlx5/core/en/tc_tun.c index a14f216048cd..de74dbfe7b20 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -453,8 +453,7 @@ static int mlx5e_route_lookup_ipv6_get(struct mlx5e_pri= v *priv, =20 if (tunnel && tunnel->get_remote_ifindex) attr->fl.fl6.flowi6_oif =3D tunnel->get_remote_ifindex(dev); - dst =3D ipv6_stub->ipv6_dst_lookup_flow(dev_net(dev), NULL, &attr->fl.fl6, - NULL); + dst =3D ip6_dst_lookup_flow(dev_net(dev), NULL, &attr->fl.fl6, NULL); if (IS_ERR(dst)) return PTR_ERR(dst); =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/dr= ivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c index bfd401bee9e8..ce2a27124642 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c @@ -402,7 +402,7 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neig= h_hash_entry *nhe) tbl =3D &arp_tbl; #if IS_ENABLED(CONFIG_IPV6) else if (m_neigh->family =3D=3D AF_INET6) - tbl =3D ipv6_stub->nd_tbl; + tbl =3D ipv6_get_nd_tbl(); #endif else return; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/dri= vers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c index 64e13747084e..a52e12c3c95a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c @@ -36,7 +36,6 @@ #include #include #include -#include =20 #include "en.h" #include "eswitch.h" diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net= /ethernet/mellanox/mlx5/core/en_rep.c index 1db4ecb2356f..5ec5cae8d229 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -38,7 +38,6 @@ #include #include #include -#include =20 #include "eswitch.h" #include "en.h" diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_tc.c index 1434b65d4746..4e4ee1d520ce 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/driver= s/net/ethernet/mellanox/mlxsw/spectrum_router.c index 7bd87d0547d8..8531216f6389 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -2458,7 +2458,7 @@ static void mlxsw_sp_router_neigh_ent_ipv6_process(st= ruct mlxsw_sp *mlxsw_sp, } =20 dev =3D mlxsw_sp_rif_dev(mlxsw_sp->router->rifs[rif]); - n =3D neigh_lookup(&nd_tbl, &dip, dev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &dip, dev); if (!n) return; =20 @@ -3022,7 +3022,8 @@ static int mlxsw_sp_neigh_rif_made_sync(struct mlxsw_= sp *mlxsw_sp, goto err_arp; =20 #if IS_ENABLED(CONFIG_IPV6) - neigh_for_each(&nd_tbl, mlxsw_sp_neigh_rif_made_sync_each, &rms); + neigh_for_each(ipv6_get_nd_tbl(), + mlxsw_sp_neigh_rif_made_sync_each, &rms); #endif if (rms.err) goto err_nd; @@ -5124,7 +5125,7 @@ mlxsw_sp_nexthop_obj_init(struct mlxsw_sp *mlxsw_sp, case AF_INET6: memcpy(&nh->gw_addr, &nh_obj->ipv6, sizeof(nh_obj->ipv6)); #if IS_ENABLED(CONFIG_IPV6) - nh->neigh_tbl =3D &nd_tbl; + nh->neigh_tbl =3D ipv6_get_nd_tbl(); #endif break; } @@ -6980,7 +6981,7 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *ml= xsw_sp, nh->nh_weight =3D rt->fib6_nh->fib_nh_weight; memcpy(&nh->gw_addr, &rt->fib6_nh->fib_nh_gw6, sizeof(nh->gw_addr)); #if IS_ENABLED(CONFIG_IPV6) - nh->neigh_tbl =3D &nd_tbl; + nh->neigh_tbl =3D ipv6_get_nd_tbl(); #endif =20 err =3D mlxsw_sp_nexthop_counter_enable(mlxsw_sp, nh); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/= net/ethernet/mellanox/mlxsw/spectrum_span.c index ae63d549b542..f05ccf3db876 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -576,7 +576,8 @@ mlxsw_sp_span_entry_gretap6_parms(struct mlxsw_sp *mlxs= w_sp, l3edev =3D mlxsw_sp_span_gretap6_route(to_dev, &saddr.addr6, &gw.addr6); return mlxsw_sp_span_entry_tunnel_parms_common(l3edev, saddr, daddr, gw, tparm.hop_limit, - &nd_tbl, sparmsp); + ipv6_get_nd_tbl(), + sparmsp); } =20 static int diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/n= et/ethernet/netronome/nfp/flower/action.c index aca2a7417af3..ae2f8b31adfb 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c @@ -470,7 +470,7 @@ nfp_fl_set_tun(struct nfp_app *app, struct nfp_fl_set_t= un *set_tun, =20 flow.daddr =3D ip_tun->key.u.ipv6.dst; flow.flowi4_proto =3D IPPROTO_UDP; - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &flow, NULL); + dst =3D ip6_dst_lookup_flow(net, NULL, &flow, NULL); if (!IS_ERR(dst)) { set_tun->ttl =3D ip6_dst_hoplimit(dst); dst_release(dst); diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/driv= ers/net/ethernet/netronome/nfp/flower/tunnel_conf.c index 0cef0e2b85d0..053265e135f6 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c @@ -277,7 +277,7 @@ void nfp_tunnel_keep_alive_v6(struct nfp_app *app, stru= ct sk_buff *skb) if (!netdev) continue; =20 - n =3D neigh_lookup(&nd_tbl, ipv6_add, netdev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), ipv6_add, netdev); if (!n) continue; =20 @@ -650,7 +650,7 @@ static void nfp_tun_neigh_update(struct work_struct *wo= rk) flow6.daddr =3D *(struct in6_addr *)n->primary_key; if (!neigh_invalid) { struct dst_entry *dst; - /* Use ipv6_dst_lookup_flow to populate flow6->saddr + /* Use ip6_dst_lookup_flow to populate flow6->saddr * and other fields. This information is only needed * for new entries, lookup can be skipped when an entry * gets invalidated - as only the daddr is needed for @@ -730,7 +730,7 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, = unsigned long event, return NOTIFY_DONE; } #if IS_ENABLED(CONFIG_IPV6) - if (n->tbl !=3D ipv6_stub->nd_tbl && n->tbl !=3D &arp_tbl) + if (n->tbl !=3D ipv6_get_nd_tbl() && n->tbl !=3D &arp_tbl) #else if (n->tbl !=3D &arp_tbl) #endif @@ -815,8 +815,7 @@ void nfp_tunnel_request_route_v6(struct nfp_app *app, s= truct sk_buff *skb) flow.flowi6_proto =3D IPPROTO_UDP; =20 #if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6) - dst =3D ipv6_stub->ipv6_dst_lookup_flow(dev_net(netdev), NULL, &flow, - NULL); + dst =3D ip6_dst_lookup_flow(dev_net(netdev), NULL, &flow, NULL); if (IS_ERR(dst)) goto fail_rcu_unlock; #else diff --git a/drivers/net/ethernet/sfc/tc_counters.c b/drivers/net/ethernet/= sfc/tc_counters.c index d168282f30bf..d8a5f9fd1007 100644 --- a/drivers/net/ethernet/sfc/tc_counters.c +++ b/drivers/net/ethernet/sfc/tc_counters.c @@ -112,7 +112,7 @@ static void efx_tc_counter_work(struct work_struct *wor= k) encap->neigh->egdev); else #if IS_ENABLED(CONFIG_IPV6) - n =3D neigh_lookup(ipv6_stub->nd_tbl, + n =3D neigh_lookup(ipv6_get_nd_tbl(), &encap->neigh->dst_ip6, encap->neigh->egdev); #else diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.c b/drivers/net/ethe= rnet/sfc/tc_encap_actions.c index da35705cc5e1..63d8f794b869 100644 --- a/drivers/net/ethernet/sfc/tc_encap_actions.c +++ b/drivers/net/ethernet/sfc/tc_encap_actions.c @@ -149,8 +149,7 @@ static int efx_bind_neigh(struct efx_nic *efx, #if IS_ENABLED(CONFIG_IPV6) struct dst_entry *dst; =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &flow6, - NULL); + dst =3D ip6_dst_lookup_flow(net, NULL, &flow6, NULL); rc =3D PTR_ERR_OR_ZERO(dst); if (rc) { NL_SET_ERR_MSG_MOD(extack, "Failed to lookup route for IPv6 encap"); @@ -531,7 +530,7 @@ static int efx_neigh_event(struct efx_nic *efx, struct = neighbour *n) if (n->tbl =3D=3D &arp_tbl) { keysize =3D sizeof(keys.dst_ip); #if IS_ENABLED(CONFIG_IPV6) - } else if (n->tbl =3D=3D ipv6_stub->nd_tbl) { + } else if (n->tbl =3D=3D ipv6_get_nd_tbl()) { ipv6 =3D true; keysize =3D sizeof(keys.dst_ip6); #endif diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 01cdd06102e0..c6563367d382 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index e8949f556209..70b9e58b9b78 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -374,7 +374,7 @@ static struct rt6_info *ip6_route_output_gtp(struct net= *net, fl6->saddr =3D *saddr; fl6->flowi6_proto =3D sk->sk_protocol; =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, sk, fl6, NULL); + dst =3D ip6_dst_lookup_flow(net, sk, fl6, NULL); if (IS_ERR(dst)) return ERR_PTR(-ENETUNREACH); =20 diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c index 3716a1d82801..6dd11c71204b 100644 --- a/drivers/net/ovpn/peer.c +++ b/drivers/net/ovpn/peer.c @@ -821,8 +821,7 @@ static struct in6_addr ovpn_nexthop_from_rt6(struct ovp= n_priv *ovpn, .daddr =3D dest, }; =20 - entry =3D ipv6_stub->ipv6_dst_lookup_flow(dev_net(ovpn->dev), NULL, &fl, - NULL); + entry =3D ip6_dst_lookup_flow(dev_net(ovpn->dev), NULL, &fl, NULL); if (IS_ERR(entry)) { net_dbg_ratelimited("%s: no route to host %pI6c\n", netdev_name(ovpn->dev), &dest); diff --git a/drivers/net/ovpn/udp.c b/drivers/net/ovpn/udp.c index 272b535ecaad..059e896b4a2f 100644 --- a/drivers/net/ovpn/udp.c +++ b/drivers/net/ovpn/udp.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -251,7 +250,7 @@ static int ovpn_udp6_output(struct ovpn_peer *peer, str= uct ovpn_bind *bind, dst_cache_reset(cache); } =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(sock_net(sk), sk, &fl, NULL); + dst =3D ip6_dst_lookup_flow(sock_net(sk), sk, &fl, NULL); if (IS_ERR(dst)) { ret =3D PTR_ERR(dst); net_dbg_ratelimited("%s: no route to host %pISpc: %d\n", diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index dbf01210b0e7..877fb0ed7d3d 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -20,7 +20,6 @@ #include #include #include -#include #include =20 /* alternative VLAN for IP session 0 if not untagged */ @@ -302,6 +301,7 @@ static struct sk_buff *cdc_mbim_tx_fixup(struct usbnet = *dev, struct sk_buff *skb return NULL; } =20 +#if IS_ENABLED(CONFIG_IPV6) /* Some devices are known to send Neighbor Solicitation messages and * require Neighbor Advertisement replies. The IPv6 core will not * respond since IFF_NOARP is set, so we must handle them ourselves. @@ -342,12 +342,11 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *= buf, u16 tci) is_router =3D !!READ_ONCE(in6_dev->cnf.forwarding); in6_dev_put(in6_dev); =20 - /* ipv6_stub !=3D NULL if in6_dev_get returned an inet6_dev */ - ipv6_stub->ndisc_send_na(netdev, &iph->saddr, &msg->target, - is_router /* router */, - true /* solicited */, - false /* override */, - true /* inc_opt */); + ndisc_send_na(netdev, &iph->saddr, &msg->target, + is_router /* router */, + true /* solicited */, + false /* override */, + true /* inc_opt */); out: dev_put(netdev); } @@ -362,7 +361,7 @@ static bool is_neigh_solicit(u8 *buf, size_t len) msg->icmph.icmp6_code =3D=3D 0 && msg->icmph.icmp6_type =3D=3D NDISC_NEIGHBOUR_SOLICITATION); } - +#endif /* IPV6 */ =20 static struct sk_buff *cdc_mbim_process_dgram(struct usbnet *dev, u8 *buf,= size_t len, u16 tci) { @@ -378,8 +377,10 @@ static struct sk_buff *cdc_mbim_process_dgram(struct u= sbnet *dev, u8 *buf, size_ proto =3D htons(ETH_P_IP); break; case 0x60: +#if IS_ENABLED(CONFIG_IPV6) if (is_neigh_solicit(buf, len)) do_neigh_solicit(dev, buf, tci); +#endif proto =3D htons(ETH_P_IPV6); break; default: diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 8c009bcaa8e7..68edb47cc4eb 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -616,7 +616,8 @@ static int vrf_finish_output6(struct net *net, struct s= ock *sk, nexthop =3D rt6_nexthop(dst_rt6_info(dst), &ipv6_hdr(skb)->daddr); neigh =3D __ipv6_neigh_lookup_noref(dst->dev, nexthop); if (unlikely(!neigh)) - neigh =3D __neigh_create(&nd_tbl, nexthop, dst->dev, false); + neigh =3D __neigh_create(ipv6_get_nd_tbl(), nexthop, + dst->dev, false); if (!IS_ERR(neigh)) { sock_confirm_neigh(skb, neigh); ret =3D neigh_output(neigh, skb, false); diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 17c941aac32d..4ab94dfe0d12 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -2045,7 +2044,7 @@ static int neigh_reduce(struct net_device *dev, struc= t sk_buff *skb, __be32 vni) ipv6_addr_is_multicast(&msg->target)) goto out; =20 - n =3D neigh_lookup(ipv6_stub->nd_tbl, &msg->target, dev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &msg->target, dev); =20 if (n) { struct vxlan_rdst *rdst =3D NULL; @@ -2130,15 +2129,15 @@ static bool route_shortcircuit(struct net_device *d= ev, struct sk_buff *skb) { struct ipv6hdr *pip6; =20 - /* check if nd_tbl is not initiliazed due to - * ipv6.disable=3D1 set during boot + /* check if ipv6.disable=3D1 set during boot was set + * during booting so nd_tbl is not initialized */ - if (!ipv6_stub->nd_tbl) + if (!ipv6_mod_enabled()) return false; if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) return false; pip6 =3D ipv6_hdr(skb); - n =3D neigh_lookup(ipv6_stub->nd_tbl, &pip6->daddr, dev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &pip6->daddr, dev); if (!n && (vxlan->cfg.flags & VXLAN_F_L3MISS)) { union vxlan_addr ipa =3D { .sin6.sin6_addr =3D pip6->daddr, diff --git a/drivers/net/vxlan/vxlan_multicast.c b/drivers/net/vxlan/vxlan_= multicast.c index a7f2d67dc61b..b0e80bca855c 100644 --- a/drivers/net/vxlan/vxlan_multicast.c +++ b/drivers/net/vxlan/vxlan_multicast.c @@ -39,8 +39,7 @@ int vxlan_igmp_join(struct vxlan_dev *vxlan, union vxlan_= addr *rip, =20 sk =3D sock6->sock->sk; lock_sock(sk); - ret =3D ipv6_stub->ipv6_sock_mc_join(sk, ifindex, - &ip->sin6.sin6_addr); + ret =3D ipv6_sock_mc_join(sk, ifindex, &ip->sin6.sin6_addr); release_sock(sk); #endif } @@ -73,8 +72,7 @@ int vxlan_igmp_leave(struct vxlan_dev *vxlan, union vxlan= _addr *rip, =20 sk =3D sock6->sock->sk; lock_sock(sk); - ret =3D ipv6_stub->ipv6_sock_mc_drop(sk, ifindex, - &ip->sin6.sin6_addr); + ret =3D ipv6_sock_mc_drop(sk, ifindex, &ip->sin6.sin6_addr); release_sock(sk); #endif } diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index 253488f8c00f..c362c78d908e 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -136,8 +136,7 @@ static int send6(struct wg_device *wg, struct sk_buff *= skb, if (cache) dst_cache_reset(cache); } - dst =3D ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl, - NULL); + dst =3D ip6_dst_lookup_flow(sock_net(sock), sock, &fl, NULL); if (IS_ERR(dst)) { ret =3D PTR_ERR(dst); net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wir= eless/intel/ipw2x00/ipw2100.c index 248a051da52d..c11428485dcc 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@ -4838,7 +4838,7 @@ static int ipw2100_system_config(struct ipw2100_priv = *priv, int batch_mode) =20 /* If IPv6 is configured in the kernel then we don't want to filter out all * of the multicast packets as IPv6 needs some. */ -#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) +#if !defined(CONFIG_IPV6) cmd.host_command =3D ADD_MULTICAST; cmd.host_command_sequence =3D 0; cmd.host_command_length =3D 0; diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index 1e2b51769eec..494bf69a3017 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -17,7 +17,6 @@ #include #include #include -#include #if IS_ENABLED(CONFIG_IPV6) #include #endif @@ -455,7 +454,7 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_= bridge *br, return; } =20 - n =3D neigh_lookup(ipv6_stub->nd_tbl, &msg->target, vlandev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &msg->target, vlandev); if (n) { struct net_bridge_fdb_entry *f; =20 --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEE483E3C4B for ; Tue, 17 Mar 2026 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756231; cv=none; b=qqVW1ajXY4/0qLNcbK1WOcsiEHN1QWXXLZsnYP0P3TEGsKk2lKyr5vqaUwkzzUCpgNBWsFenWZS6sv0ZsggcqEIRYh0xzntWrZF3gyk+t8qm9RGd+bMpsOyiTdTqSj7EAz7Bje8uGf3sIhi/ml99qcPCvBfjT0kMwjI/Yksz8UA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756231; c=relaxed/simple; bh=5xfC5J26jWpgy51Ar7US32CgEPmNriY5ioSI5/u2CVY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hPw15lEzPG60RCvFsno0GZSsfD8ZweyjeEAJR9BwGaRb4nEsFL7asWiId/fCdPcuccpcGssyR2MvH4XXlWsNh3f8hFd3qo3jsgY1U0rN/Zie9phM93zL2sH14u2icLY9BV6tYTOICc0JopnRYYjp2CqT1Mt4uEEnlktMsdtPQG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 685885BE15; Tue, 17 Mar 2026 14:03:48 +0000 (UTC) Authentication-Results: smtp-out2.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B443B4273C; Tue, 17 Mar 2026 14:03:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gCfzKENfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:47 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Willem de Bruijn , linux-kernel@vger.kernel.org Subject: [PATCH 06/10 net-next v3] ipv4: drop ipv6_stub usage and use direct function calls Date: Tue, 17 Mar 2026 15:01:02 +0100 Message-ID: <20260317140141.5723-7-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Queue-Id: 685885BE15 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: As IPv6 is built-in only, the ipv6_stub infrastructure is no longer necessary. The IPv4 stack interacts with IPv6 mainly to support IPv4 routes with IPv6 next-hops (RFC 8950). Convert all these cross-family calls from ipv6_stub to direct function calls. The fallback functions introduced previously will prevent linkage errors when CONFIG_IPV6 is disabled. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- net/ipv4/fib_semantics.c | 11 +++++------ net/ipv4/icmp.c | 2 +- net/ipv4/nexthop.c | 21 ++++++++++----------- net/ipv4/route.c | 2 +- net/ipv4/udp.c | 7 ++----- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 01cb587866d8..b576dd74d678 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -586,8 +586,7 @@ static int fib_detect_death(struct fib_info *fi, int or= der, if (likely(nhc->nhc_gw_family =3D=3D AF_INET)) n =3D neigh_lookup(&arp_tbl, &nhc->nhc_gw.ipv4, nhc->nhc_dev); else if (nhc->nhc_gw_family =3D=3D AF_INET6) - n =3D neigh_lookup(ipv6_stub->nd_tbl, &nhc->nhc_gw.ipv6, - nhc->nhc_dev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &nhc->nhc_gw.ipv6, nhc->nhc_dev); else n =3D NULL; =20 @@ -1083,7 +1082,7 @@ static int fib_check_nh_v6_gw(struct net *net, struct= fib_nh *nh, struct fib6_nh fib6_nh =3D {}; int err; =20 - err =3D ipv6_stub->fib6_nh_init(net, &fib6_nh, &cfg, GFP_KERNEL, extack); + err =3D fib6_nh_init(net, &fib6_nh, &cfg, GFP_KERNEL, extack); if (!err) { nh->fib_nh_dev =3D fib6_nh.fib_nh_dev; netdev_hold(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, @@ -1091,7 +1090,7 @@ static int fib_check_nh_v6_gw(struct net *net, struct= fib_nh *nh, nh->fib_nh_oif =3D nh->fib_nh_dev->ifindex; nh->fib_nh_scope =3D RT_SCOPE_LINK; =20 - ipv6_stub->fib6_nh_release(&fib6_nh); + fib6_nh_release(&fib6_nh); } =20 return err; @@ -2148,8 +2147,8 @@ static bool fib_good_nh(const struct fib_nh *nh) n =3D __ipv4_neigh_lookup_noref(nh->fib_nh_dev, (__force u32)nh->fib_nh_gw4); else if (nh->fib_nh_gw_family =3D=3D AF_INET6) - n =3D __ipv6_neigh_lookup_noref_stub(nh->fib_nh_dev, - &nh->fib_nh_gw6); + n =3D __ipv6_neigh_lookup_noref(nh->fib_nh_dev, + &nh->fib_nh_gw6); else n =3D NULL; if (n) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index ac6d2ffc1963..f76c9ac183ae 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -1342,7 +1342,7 @@ bool icmp_build_probe(struct sk_buff *skb, struct icm= phdr *icmphdr) case ICMP_AFI_IP6: if (iio->ident.addr.ctype3_hdr.addrlen !=3D sizeof(struct in6_addr)) goto send_mal_query; - dev =3D ipv6_stub->ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_add= r, dev); + dev =3D ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev); dev_hold(dev); break; #endif diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index c942f1282236..cfb235f51ab6 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -510,7 +510,7 @@ static void nexthop_free_single(struct nexthop *nh) fib_nh_release(nh->net, &nhi->fib_nh); break; case AF_INET6: - ipv6_stub->fib6_nh_release(&nhi->fib6_nh); + fib6_nh_release(&nhi->fib6_nh); break; } kfree(nhi); @@ -1367,7 +1367,7 @@ static bool ipv6_good_nh(const struct fib6_nh *nh) =20 rcu_read_lock(); =20 - n =3D __ipv6_neigh_lookup_noref_stub(nh->fib_nh_dev, &nh->fib_nh_gw6); + n =3D __ipv6_neigh_lookup_noref(nh->fib_nh_dev, &nh->fib_nh_gw6); if (n) state =3D READ_ONCE(n->nud_state); =20 @@ -2151,8 +2151,8 @@ static void __remove_nexthop_fib(struct net *net, str= uct nexthop *nh) fib6_info_hold(f6i); =20 spin_unlock_bh(&nh->lock); - ipv6_stub->ip6_del_rt(net, f6i, - !READ_ONCE(net->ipv4.sysctl_nexthop_compat_mode)); + ip6_del_rt(net, f6i, + !READ_ONCE(net->ipv4.sysctl_nexthop_compat_mode)); =20 spin_lock_bh(&nh->lock); } @@ -2209,7 +2209,7 @@ static void nh_rt_cache_flush(struct net *net, struct= nexthop *nh, rt_cache_flush(net); =20 list_for_each_entry(f6i, &nh->f6i_list, nh_list) - ipv6_stub->fib6_update_sernum(net, f6i); + fib6_update_sernum(net, f6i); =20 /* if an IPv6 group was replaced, we have to release all old * dsts to make sure all refcounts are released @@ -2223,7 +2223,7 @@ static void nh_rt_cache_flush(struct net *net, struct= nexthop *nh, struct nh_info *nhi =3D rtnl_dereference(nhge->nh->nh_info); =20 if (nhi->family =3D=3D AF_INET6) - ipv6_stub->fib6_nh_release_dsts(&nhi->fib6_nh); + fib6_nh_release_dsts(&nhi->fib6_nh); } } =20 @@ -2504,7 +2504,7 @@ static void __nexthop_replace_notify(struct net *net,= struct nexthop *nh, } =20 list_for_each_entry(f6i, &nh->f6i_list, nh_list) - ipv6_stub->fib6_rt_update(net, f6i, info); + fib6_rt_update(net, f6i, info); } =20 /* send RTM_NEWROUTE with REPLACE flag set for all FIB entries @@ -2877,13 +2877,12 @@ static int nh_create_ipv6(struct net *net, struct = nexthop *nh, fib6_cfg.fc_flags |=3D RTF_GATEWAY; =20 /* sets nh_dev if successful */ - err =3D ipv6_stub->fib6_nh_init(net, fib6_nh, &fib6_cfg, GFP_KERNEL, - extack); + err =3D fib6_nh_init(net, fib6_nh, &fib6_cfg, GFP_KERNEL, extack); if (err) { /* IPv6 is not enabled, don't call fib6_nh_release */ if (err =3D=3D -EAFNOSUPPORT) goto out; - ipv6_stub->fib6_nh_release(fib6_nh); + fib6_nh_release(fib6_nh); } else { nh->nh_flags =3D fib6_nh->fib_nh_flags; } diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 463236e0dc2d..802c68a1b446 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -447,7 +447,7 @@ static void ipv4_confirm_neigh(const struct dst_entry *= dst, const void *daddr) if (rt->rt_gw_family =3D=3D AF_INET) { pkey =3D (const __be32 *)&rt->rt_gw4; } else if (rt->rt_gw_family =3D=3D AF_INET6) { - return __ipv6_confirm_neigh_stub(dev, &rt->rt_gw6); + return __ipv6_confirm_neigh(dev, &rt->rt_gw6); } else if (!daddr || (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL))) { diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 7e3f9fd9de19..85490358098d 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -118,9 +118,6 @@ #include #include #include -#if IS_ENABLED(CONFIG_IPV6) -#include -#endif #include =20 struct udp_table udp_table __read_mostly; @@ -2877,7 +2874,7 @@ static void set_xfrm_gro_udp_encap_rcv(__u16 encap_ty= pe, unsigned short family, =20 if (udp_test_bit(GRO_ENABLED, sk) && encap_type =3D=3D UDP_ENCAP_ESPINUDP= ) { if (IS_ENABLED(CONFIG_IPV6) && family =3D=3D AF_INET6) - new_gro_receive =3D ipv6_stub->xfrm6_gro_udp_encap_rcv; + new_gro_receive =3D xfrm6_gro_udp_encap_rcv; else new_gro_receive =3D xfrm4_gro_udp_encap_rcv; =20 @@ -2949,7 +2946,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, in= t optname, #if IS_ENABLED(CONFIG_IPV6) if (sk->sk_family =3D=3D AF_INET6) WRITE_ONCE(up->encap_rcv, - ipv6_stub->xfrm6_udp_encap_rcv); + xfrm6_udp_encap_rcv); else #endif WRITE_ONCE(up->encap_rcv, --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A83EA3E51EB for ; Tue, 17 Mar 2026 14:03:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756238; cv=none; b=T7bDgwyH7231hnr0wpfVBqmWAckOYMdnp+vm5gfm2NSqFHPkNhq3KV9PHAYHbCScHvVcnHblUtYGdpdcwrQNuuw+RwIAAM3GgAn0fgKhx7bAMAJqtbXjlXCS7Ap1lXMpz/XHlJjgELEwLmKw+KVCH8EpXaXXKUOlPtKHWbJxH7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756238; c=relaxed/simple; bh=5Nb9LK8r9IyyJM5004Ss24FqxXs5Dg86yIi8ooN7u00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qOAWW9zafdxWtupH4ouxBEEgvD0UhMp3Buq5BwPvCv0pZ50a+3UYvIuAbAJs638Bb6WUVadH2KnUQ2E5X34ZcHcwyBKCqFfkC4bilZ69Td/SXpoA+uDP6xoddHN82Jiv1kbpMOhdW1shakI/F0dGyZ1VAP6UBqPNcO5d2k0rgUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 24ECC4D351; Tue, 17 Mar 2026 14:03:55 +0000 (UTC) Authentication-Results: smtp-out1.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 942EF4273B; Tue, 17 Mar 2026 14:03:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aNcwIUlfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:03:53 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Aaron Conole , Eelco Chaudron , Ilya Maximets , Jamal Hadi Salim , Jiri Pirko , Jon Maloy , Steffen Klassert , Herbert Xu , Kuniyuki Iwashima , Guillaume Nault , Breno Leitao , Kees Cook , Stanislav Fomichev , linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, dev@openvswitch.org, tipc-discussion@lists.sourceforge.net Subject: [PATCH 07/10 net-next v3] net: convert remaining ipv6_stub users to direct function calls Date: Tue, 17 Mar 2026 15:01:03 +0100 Message-ID: <20260317140141.5723-8-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Queue-Id: 24ECC4D351 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: As IPv6 is built-in only, the ipv6_stub infrastruture is no longer necessary. Convert remaining ipv6_stub users to make direct function calls. The fallback functions introduced previously will prevent linkage errors when CONFIG_IPV6 is disabled. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/net/udp_tunnel.h | 2 +- net/ieee802154/6lowpan/tx.c | 2 +- net/mpls/af_mpls.c | 3 +-- net/openvswitch/actions.c | 3 ++- net/sched/sch_frag.c | 4 ++-- net/tipc/udp_media.c | 9 +++------ net/xfrm/espintcp.c | 5 +---- net/xfrm/xfrm_nat_keepalive.c | 4 ++-- net/xfrm/xfrm_output.c | 3 +-- 9 files changed, 14 insertions(+), 21 deletions(-) diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index d9c6d04bb3b5..277f1ce1c02d 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -230,7 +230,7 @@ static inline void udp_tunnel_encap_enable(struct sock = *sk) =20 #if IS_ENABLED(CONFIG_IPV6) if (READ_ONCE(sk->sk_family) =3D=3D PF_INET6) - ipv6_stub->udpv6_encap_enable(); + udpv6_encap_enable(); #endif udp_encap_enable(); } diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c index 0c07662b44c0..69ec02386aaa 100644 --- a/net/ieee802154/6lowpan/tx.c +++ b/net/ieee802154/6lowpan/tx.c @@ -59,7 +59,7 @@ int lowpan_header_create(struct sk_buff *skb, struct net_= device *ldev, } else { __le16 short_addr =3D cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC); =20 - n =3D neigh_lookup(&nd_tbl, &hdr->daddr, ldev); + n =3D neigh_lookup(ipv6_get_nd_tbl(), &hdr->daddr, ldev); if (n) { llneigh =3D lowpan_802154_neigh(neighbour_priv(n)); read_lock_bh(&n->lock); diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index ae85a7654b1f..8b4c0b7d55a2 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -24,7 +24,6 @@ #if IS_ENABLED(CONFIG_IPV6) #include #endif -#include #include #include "internal.h" =20 @@ -642,7 +641,7 @@ static struct net_device *inet6_fib_lookup_dev(struct n= et *net, =20 memset(&fl6, 0, sizeof(fl6)); memcpy(&fl6.daddr, addr, sizeof(struct in6_addr)); - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &fl6, NULL); + dst =3D ip6_dst_lookup_flow(net, NULL, &fl6, NULL); if (IS_ERR(dst)) return ERR_CAST(dst); =20 diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 792ca44a461d..140388a18ae0 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -810,7 +811,7 @@ static void ovs_fragment(struct net *net, struct vport = *vport, skb_dst_set_noref(skb, &ovs_rt.dst); IP6CB(skb)->frag_max_size =3D mru; =20 - ipv6_stub->ipv6_fragment(net, skb->sk, skb, ovs_vport_output); + ip6_fragment(net, skb->sk, skb, ovs_vport_output); refdst_drop(orig_dst); } else { WARN_ONCE(1, "Failed fragment ->%s: eth=3D%04x, MRU=3D%d, MTU=3D%d.", diff --git a/net/sched/sch_frag.c b/net/sched/sch_frag.c index d1d87dce7f3f..75ee52750919 100644 --- a/net/sched/sch_frag.c +++ b/net/sched/sch_frag.c @@ -6,6 +6,7 @@ #include #include #include +#include =20 struct sch_frag_data { unsigned long dst; @@ -127,8 +128,7 @@ static int sch_fragment(struct net *net, struct sk_buff= *skb, skb_dst_set_noref(skb, &sch_frag_rt.dst); IP6CB(skb)->frag_max_size =3D mru; =20 - ret =3D ipv6_stub->ipv6_fragment(net, skb->sk, skb, - sch_frag_xmit); + ret =3D ip6_fragment(net, skb->sk, skb, sch_frag_xmit); local_unlock_nested_bh(&sch_frag_data_storage.bh_lock); refdst_drop(orig_dst); } else { diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 2b8e385d1e51..2c66b356025a 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "core.h" #include "addr.h" @@ -207,9 +206,8 @@ static int tipc_udp_xmit(struct net *net, struct sk_buf= f *skb, .saddr =3D src->ipv6, .flowi6_proto =3D IPPROTO_UDP }; - ndst =3D ipv6_stub->ipv6_dst_lookup_flow(net, - ub->ubsock->sk, - &fl6, NULL); + ndst =3D ip6_dst_lookup_flow(net, ub->ubsock->sk, + &fl6, NULL); if (IS_ERR(ndst)) { err =3D PTR_ERR(ndst); goto tx_error; @@ -418,8 +416,7 @@ static int enable_mcast(struct udp_bearer *ub, struct u= dp_media_addr *remote) #if IS_ENABLED(CONFIG_IPV6) } else { lock_sock(sk); - err =3D ipv6_stub->ipv6_sock_mc_join(sk, ub->ifindex, - &remote->ipv6); + err =3D ipv6_sock_mc_join(sk, ub->ifindex, &remote->ipv6); release_sock(sk); #endif } diff --git a/net/xfrm/espintcp.c b/net/xfrm/espintcp.c index 998832419097..a2756186e13a 100644 --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -7,9 +7,6 @@ #include #include #include -#if IS_ENABLED(CONFIG_IPV6) -#include -#endif #include =20 static void handle_nonesp(struct espintcp_ctx *ctx, struct sk_buff *skb, @@ -43,7 +40,7 @@ static void handle_esp(struct sk_buff *skb, struct sock *= sk) local_bh_disable(); #if IS_ENABLED(CONFIG_IPV6) if (sk->sk_family =3D=3D AF_INET6) - ipv6_stub->xfrm6_rcv_encap(skb, IPPROTO_ESP, 0, TCP_ENCAP_ESPINTCP); + xfrm6_rcv_encap(skb, IPPROTO_ESP, 0, TCP_ENCAP_ESPINTCP); else #endif xfrm4_rcv_encap(skb, IPPROTO_ESP, 0, TCP_ENCAP_ESPINTCP); diff --git a/net/xfrm/xfrm_nat_keepalive.c b/net/xfrm/xfrm_nat_keepalive.c index ebf95d48e86c..d47f2ed8005c 100644 --- a/net/xfrm/xfrm_nat_keepalive.c +++ b/net/xfrm/xfrm_nat_keepalive.c @@ -98,14 +98,14 @@ static int nat_keepalive_send_ipv6(struct sk_buff *skb, local_lock_nested_bh(&nat_keepalive_sk_ipv6.bh_lock); sk =3D this_cpu_read(nat_keepalive_sk_ipv6.sock); sock_net_set(sk, net); - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, sk, &fl6, NULL); + dst =3D ip6_dst_lookup_flow(net, sk, &fl6, NULL); if (IS_ERR(dst)) { local_unlock_nested_bh(&nat_keepalive_sk_ipv6.bh_lock); return PTR_ERR(dst); } =20 skb_dst_set(skb, dst); - err =3D ipv6_stub->ip6_xmit(sk, skb, &fl6, skb->mark, NULL, 0, 0); + err =3D ip6_xmit(sk, skb, &fl6, skb->mark, NULL, 0, 0); sock_net_set(sk, &init_net); local_unlock_nested_bh(&nat_keepalive_sk_ipv6.bh_lock); return err; diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 54222fcbd7fd..a9652b422f51 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -20,7 +20,6 @@ =20 #if IS_ENABLED(CONFIG_IPV6) #include -#include #endif =20 #include "xfrm_inout.h" @@ -900,7 +899,7 @@ int xfrm6_tunnel_check_size(struct sk_buff *skb) skb->protocol =3D htons(ETH_P_IPV6); =20 if (xfrm6_local_dontfrag(sk)) - ipv6_stub->xfrm6_local_rxpmtu(skb, mtu); + xfrm6_local_rxpmtu(skb, mtu); else if (sk) xfrm_local_error(skb, mtu); else --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09D573E5599 for ; Tue, 17 Mar 2026 14:04:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756246; cv=none; b=JKGSMfCmHeS6OnxH0VGjXKw2znN3EKyBPkpFpBYxxtuXBdUHMvwCKlODzkAJwRyYq3qDE3FsSw6iXVI53nuiE08PsRUNvkpPtl8+f8MdiA40w0TknBQO5uuP15NgYw2Ycx1D6DvW6sQCR30yCQrNyfotN2o9PgkOtUKma3/8Xho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756246; c=relaxed/simple; bh=3jvxW6pHxByhhZjqbzIAI4m52uwu49SVDXIOpG9CHI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FNr8QkpBdH7NQq/og/d95UjbRV7ooOwtOoLGAJPq/uI4p4rAmArJ4WcIOiVlWY5FoE0M/tIB1ND8/v1NYainkcU4ukwsVo3mU6/I4IUIH8Pb3QyepSPDAB7TywWX4Ixe3B4PhegHiHQzeuCZaGNJoUdmr5GqfEqvs1Uf96lnYU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7CE5B4D341; Tue, 17 Mar 2026 14:04:03 +0000 (UTC) Authentication-Results: smtp-out1.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1B26B4273C; Tue, 17 Mar 2026 14:04:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aMioA1JfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:04:02 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , Daniel Borkmann , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Martin KaFai Lau , John Fastabend , Stanislav Fomichev , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , Guillaume Nault , Ido Schimmel , linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 08/10 net-next v3] bpf: remove ipv6_bpf_stub completely and use direct function calls Date: Tue, 17 Mar 2026 15:01:04 +0100 Message-ID: <20260317140141.5723-9-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US] X-Rspamd-Queue-Id: 7CE5B4D341 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: As IPv6 is built-in only, the ipv6_bpf_stub can be removed completely. Convert all ipv6_bpf_stub usage to direct function calls instead. The fallback functions introduced previously will prevent linkage errors when CONFIG_IPV6 is disabled. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re Acked-by: Daniel Borkmann --- include/net/ipv6.h | 2 ++ include/net/ipv6_stubs.h | 21 ---------------- net/core/filter.c | 54 ++++++++++++++++------------------------ net/core/lwt_bpf.c | 10 +++++--- net/ipv6/af_inet6.c | 13 ++-------- 5 files changed, 33 insertions(+), 67 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index f99f273341f0..d042afe7a245 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1149,6 +1149,8 @@ void ipv6_local_rxpmtu(struct sock *sk, struct flowi6= *fl6, u32 mtu); void inet6_cleanup_sock(struct sock *sk); void inet6_sock_destruct(struct sock *sk); int inet6_release(struct socket *sock); +int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr= _len, + u32 flags); int inet6_bind(struct socket *sock, struct sockaddr_unsized *uaddr, int ad= dr_len); int inet6_bind_sk(struct sock *sk, struct sockaddr_unsized *uaddr, int add= r_len); int inet6_getname(struct socket *sock, struct sockaddr *uaddr, diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h index 907681cecde8..dc708d9eca7a 100644 --- a/include/net/ipv6_stubs.h +++ b/include/net/ipv6_stubs.h @@ -77,25 +77,4 @@ struct ipv6_stub { __u32 mark, struct ipv6_txoptions *opt, int tclass, u32 priority); }; extern const struct ipv6_stub *ipv6_stub __read_mostly; - -/* A stub used by bpf helpers. Similarly ugly as ipv6_stub */ -struct ipv6_bpf_stub { - int (*inet6_bind)(struct sock *sk, struct sockaddr_unsized *uaddr, int ad= dr_len, - u32 flags); - struct sock *(*udp6_lib_lookup)(const struct net *net, - const struct in6_addr *saddr, __be16 sport, - const struct in6_addr *daddr, __be16 dport, - int dif, int sdif, struct sk_buff *skb); - int (*ipv6_setsockopt)(struct sock *sk, int level, int optname, - sockptr_t optval, unsigned int optlen); - int (*ipv6_getsockopt)(struct sock *sk, int level, int optname, - sockptr_t optval, sockptr_t optlen); - int (*ipv6_dev_get_saddr)(struct net *net, - const struct net_device *dst_dev, - const struct in6_addr *daddr, - unsigned int prefs, - struct in6_addr *saddr); -}; -extern const struct ipv6_bpf_stub *ipv6_bpf_stub __read_mostly; - #endif diff --git a/net/core/filter.c b/net/core/filter.c index c56821afaa0f..4b0c98f0d994 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -2279,7 +2278,7 @@ static int __bpf_redirect_neigh_v6(struct sk_buff *sk= b, struct net_device *dev, .saddr =3D ip6h->saddr, }; =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &fl6, NULL); + dst =3D ip6_dst_lookup_flow(net, NULL, &fl6, NULL); if (IS_ERR(dst)) goto out_drop; =20 @@ -5577,12 +5576,12 @@ static int sol_ipv6_sockopt(struct sock *sk, int op= tname, } =20 if (getopt) - return ipv6_bpf_stub->ipv6_getsockopt(sk, SOL_IPV6, optname, - KERNEL_SOCKPTR(optval), - KERNEL_SOCKPTR(optlen)); + return do_ipv6_getsockopt(sk, SOL_IPV6, optname, + KERNEL_SOCKPTR(optval), + KERNEL_SOCKPTR(optlen)); =20 - return ipv6_bpf_stub->ipv6_setsockopt(sk, SOL_IPV6, optname, - KERNEL_SOCKPTR(optval), *optlen); + return do_ipv6_setsockopt(sk, SOL_IPV6, optname, + KERNEL_SOCKPTR(optval), *optlen); } =20 static int __bpf_setsockopt(struct sock *sk, int level, int optname, @@ -5981,9 +5980,6 @@ static const struct bpf_func_proto bpf_sock_ops_cb_fl= ags_set_proto =3D { .arg2_type =3D ARG_ANYTHING, }; =20 -const struct ipv6_bpf_stub *ipv6_bpf_stub __read_mostly; -EXPORT_SYMBOL_GPL(ipv6_bpf_stub); - BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ctx, struct sockaddr *, = addr, int, addr_len) { @@ -6007,11 +6003,9 @@ BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ct= x, struct sockaddr *, addr, return err; if (((struct sockaddr_in6 *)addr)->sin6_port =3D=3D htons(0)) flags |=3D BIND_FORCE_ADDRESS_NO_PORT; - /* ipv6_bpf_stub cannot be NULL, since it's called from - * bpf_cgroup_inet6_connect hook and ipv6 is already loaded - */ - return ipv6_bpf_stub->inet6_bind(sk, (struct sockaddr_unsized *)addr, - addr_len, flags); + + return __inet6_bind(sk, (struct sockaddr_unsized *)addr, + addr_len, flags); #endif /* CONFIG_IPV6 */ } #endif /* CONFIG_INET */ @@ -6222,7 +6216,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struc= t bpf_fib_lookup *params, neigh =3D __ipv4_neigh_lookup_noref(dev, (__force u32)params->ipv4_dst); else - neigh =3D __ipv6_neigh_lookup_noref_stub(dev, params->ipv6_dst); + neigh =3D __ipv6_neigh_lookup_noref(dev, params->ipv6_dst); =20 if (!neigh || !(READ_ONCE(neigh->nud_state) & NUD_VALID)) return BPF_FIB_LKUP_RET_NO_NEIGH; @@ -6290,12 +6284,11 @@ static int bpf_ipv6_fib_lookup(struct net *net, str= uct bpf_fib_lookup *params, params->tbid =3D 0; } =20 - tb =3D ipv6_stub->fib6_get_table(net, tbid); + tb =3D fib6_get_table(net, tbid); if (unlikely(!tb)) return BPF_FIB_LKUP_RET_NOT_FWDED; =20 - err =3D ipv6_stub->fib6_table_lookup(net, tb, oif, &fl6, &res, - strict); + err =3D fib6_table_lookup(net, tb, oif, &fl6, &res, strict); } else { if (flags & BPF_FIB_LOOKUP_MARK) fl6.flowi6_mark =3D params->mark; @@ -6305,7 +6298,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struc= t bpf_fib_lookup *params, fl6.flowi6_tun_key.tun_id =3D 0; fl6.flowi6_uid =3D sock_net_uid(net, NULL); =20 - err =3D ipv6_stub->fib6_lookup(net, oif, &fl6, &res, strict); + err =3D fib6_lookup(net, oif, &fl6, &res, strict); } =20 if (unlikely(err || IS_ERR_OR_NULL(res.f6i) || @@ -6326,11 +6319,11 @@ static int bpf_ipv6_fib_lookup(struct net *net, str= uct bpf_fib_lookup *params, return BPF_FIB_LKUP_RET_NOT_FWDED; } =20 - ipv6_stub->fib6_select_path(net, &res, &fl6, fl6.flowi6_oif, - fl6.flowi6_oif !=3D 0, NULL, strict); + fib6_select_path(net, &res, &fl6, fl6.flowi6_oif, + fl6.flowi6_oif !=3D 0, NULL, strict); =20 if (check_mtu) { - mtu =3D ipv6_stub->ip6_mtu_from_fib6(&res, dst, src); + mtu =3D ip6_mtu_from_fib6(&res, dst, src); if (params->tot_len > mtu) { params->mtu_result =3D mtu; /* union with tot_len */ return BPF_FIB_LKUP_RET_FRAG_NEEDED; @@ -6351,9 +6344,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struc= t bpf_fib_lookup *params, if (res.f6i->fib6_prefsrc.plen) { *src =3D res.f6i->fib6_prefsrc.addr; } else { - err =3D ipv6_bpf_stub->ipv6_dev_get_saddr(net, dev, - &fl6.daddr, 0, - src); + err =3D ipv6_dev_get_saddr(net, dev, &fl6.daddr, 0, src); if (err) return BPF_FIB_LKUP_RET_NO_SRC_ADDR; } @@ -6365,7 +6356,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struc= t bpf_fib_lookup *params, /* xdp and cls_bpf programs are run in RCU-bh so rcu_read_lock_bh is * not needed here. */ - neigh =3D __ipv6_neigh_lookup_noref_stub(dev, dst); + neigh =3D __ipv6_neigh_lookup_noref(dev, dst); if (!neigh || !(READ_ONCE(neigh->nud_state) & NUD_VALID)) return BPF_FIB_LKUP_RET_NO_NEIGH; memcpy(params->dmac, neigh->ha, ETH_ALEN); @@ -6900,11 +6891,10 @@ static struct sock *sk_lookup(struct net *net, stru= ct bpf_sock_tuple *tuple, src6, tuple->ipv6.sport, dst6, ntohs(tuple->ipv6.dport), dif, sdif, &refcounted); - else if (likely(ipv6_bpf_stub)) - sk =3D ipv6_bpf_stub->udp6_lib_lookup(net, - src6, tuple->ipv6.sport, - dst6, tuple->ipv6.dport, - dif, sdif, NULL); + else if (likely(ipv6_mod_enabled())) + sk =3D __udp6_lib_lookup(net, src6, tuple->ipv6.sport, + dst6, tuple->ipv6.dport, + dif, sdif, NULL); #endif } =20 diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c index 9f40be0c3e71..f71ef82a5f3d 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -13,7 +13,6 @@ #include #include #include -#include =20 struct bpf_lwt_prog { struct bpf_prog *prog; @@ -103,7 +102,12 @@ static int bpf_lwt_input_reroute(struct sk_buff *skb) dev_put(dev); } else if (skb->protocol =3D=3D htons(ETH_P_IPV6)) { skb_dst_drop(skb); - err =3D ipv6_stub->ipv6_route_input(skb); + if (IS_ENABLED(CONFIG_IPV6)) { + ip6_route_input(skb); + err =3D skb_dst(skb)->error; + } else { + err =3D -EAFNOSUPPORT; + } } else { err =3D -EAFNOSUPPORT; } @@ -233,7 +237,7 @@ static int bpf_lwt_xmit_reroute(struct sk_buff *skb) fl6.daddr =3D iph6->daddr; fl6.saddr =3D iph6->saddr; =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, skb->sk, &fl6, NULL); + dst =3D ip6_dst_lookup_flow(net, skb->sk, &fl6, NULL); if (IS_ERR(dst)) { err =3D PTR_ERR(dst); goto err; diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index bb29b29fdcfb..07ae6ea7743a 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -264,8 +264,8 @@ static int inet6_create(struct net *net, struct socket = *sock, int protocol, goto out; } =20 -static int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, i= nt addr_len, - u32 flags) +int __inet6_bind(struct sock *sk, struct sockaddr_unsized *uaddr, int addr= _len, + u32 flags) { struct sockaddr_in6 *addr =3D (struct sockaddr_in6 *)uaddr; struct inet_sock *inet =3D inet_sk(sk); @@ -1032,14 +1032,6 @@ static const struct ipv6_stub ipv6_stub_impl =3D { .ip6_xmit =3D ip6_xmit, }; =20 -static const struct ipv6_bpf_stub ipv6_bpf_stub_impl =3D { - .inet6_bind =3D __inet6_bind, - .udp6_lib_lookup =3D __udp6_lib_lookup, - .ipv6_setsockopt =3D do_ipv6_setsockopt, - .ipv6_getsockopt =3D do_ipv6_getsockopt, - .ipv6_dev_get_saddr =3D ipv6_dev_get_saddr, -}; - static int __init inet6_init(void) { struct list_head *r; @@ -1199,7 +1191,6 @@ static int __init inet6_init(void) /* ensure that ipv6 stubs are visible only after ipv6 is ready */ wmb(); ipv6_stub =3D &ipv6_stub_impl; - ipv6_bpf_stub =3D &ipv6_bpf_stub_impl; out: return err; =20 --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78FCB3E2748 for ; Tue, 17 Mar 2026 14:04:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756254; cv=none; b=q5SqwVD+sEyc1CzGcwqpQHFnVhLgAsexQX/SQ/8tYZOjURjFxQWz1VuFFwxjRGbnZVS3O5m1bShcgOXIBb6/U9iw0M4BYmg6Nz23HHjOjhdZhYm84FGoURVc4qdwRc0YmDjHWXVaErqRHvfgPLWXvzD1MV5fflTQ7o0dXFglSkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756254; c=relaxed/simple; bh=E0p5vVmgfjwpduifXRhlp3roW9o7GCKNw4kBznSnDWY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fUIDpILjeVGyA2dRsdkTt2EpaOGuZdYMEoRp3WxKUCX6M9hGaYXYSWIPWckybP6dgkQc5l+8yEhlu9vjpTwNhzv+bOdMZNeAQk+0v1jIURZn282geIVyfe4Bk6YRoYAEOujrlYbb9wcf4R8pjfk4Kf4cpZMSLOQZB5WN8khi3qM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=0VKxcKBM; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=M8GqGUcp; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=0VKxcKBM; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=M8GqGUcp; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="0VKxcKBM"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="M8GqGUcp"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="0VKxcKBM"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="M8GqGUcp" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 01E1D4D349; Tue, 17 Mar 2026 14:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756251; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QScnysvTBGhk4w21MegLreNZMPUmh+3WZyuiYWLccJQ=; b=0VKxcKBMU9cgpVEe6DoIwByNxkoDpB5RCk+TWxW4YsWc8n8lzW8qulcmWl9+YrsYnCn/w6 iFzimw+N9joB7NV/0iKA1ISxc/ZUKkLiPVU7shPW7ChsDhPSZDk4z1BJBRXq/jd5CmAX2x DGWYpMxDRJRn+SHJhYRs9NHXxcWbUMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756251; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QScnysvTBGhk4w21MegLreNZMPUmh+3WZyuiYWLccJQ=; b=M8GqGUcpWltO2eKjftsLRkcFqC4hxFUQoXTlhngkeMaImeYLRZ8xsUE4SPRvnGnUztp9/v EQBG6sC5fSwrcMDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756251; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QScnysvTBGhk4w21MegLreNZMPUmh+3WZyuiYWLccJQ=; b=0VKxcKBMU9cgpVEe6DoIwByNxkoDpB5RCk+TWxW4YsWc8n8lzW8qulcmWl9+YrsYnCn/w6 iFzimw+N9joB7NV/0iKA1ISxc/ZUKkLiPVU7shPW7ChsDhPSZDk4z1BJBRXq/jd5CmAX2x DGWYpMxDRJRn+SHJhYRs9NHXxcWbUMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756251; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QScnysvTBGhk4w21MegLreNZMPUmh+3WZyuiYWLccJQ=; b=M8GqGUcpWltO2eKjftsLRkcFqC4hxFUQoXTlhngkeMaImeYLRZ8xsUE4SPRvnGnUztp9/v EQBG6sC5fSwrcMDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5B04D4273B; Tue, 17 Mar 2026 14:04:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QAL7ElpfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:04:10 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org Subject: [PATCH 09/10 net-next v3] ipv6: remove ipv6_stub infrastructure completely Date: Tue, 17 Mar 2026 15:01:05 +0100 Message-ID: <20260317140141.5723-10-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -7.30 X-Spam-Level: X-Spamd-Result: default: False [-7.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email] X-Spam-Flag: NO As IPv6 is built-in only and there are no more users of ipv6_stub, the ipv6_stub is now entirely obsolte. Remove all the code related to the definition, initialization and usage. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/net/ip6_fib.h | 1 - include/net/ipv6_stubs.h | 80 ---------------------------------- include/net/ndisc.h | 27 ++---------- include/net/udp_tunnel.h | 1 - net/ipv6/addrconf.c | 10 ++--- net/ipv6/addrconf_core.c | 91 --------------------------------------- net/ipv6/af_inet6.c | 40 ----------------- net/ipv6/ip6_fib.c | 8 ---- net/ipv6/ip6_output.c | 4 +- net/ipv6/ip6_udp_tunnel.c | 3 +- net/ipv6/ndisc.c | 34 +++++++-------- net/ipv6/route.c | 6 +-- 12 files changed, 31 insertions(+), 274 deletions(-) delete mode 100644 include/net/ipv6_stubs.h diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 1705cd6aab18..b5e1b13bbd62 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -602,7 +602,6 @@ static inline void fib6_update_sernum(struct net *net, = struct fib6_info *rt) } #endif void fib6_update_sernum_upto_root(struct net *net, struct fib6_info *rt); -void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i); =20 void fib6_metric_set(struct fib6_info *f6i, int metric, u32 val); static inline bool fib6_metric_locked(struct fib6_info *f6i, int metric) diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h deleted file mode 100644 index dc708d9eca7a..000000000000 --- a/include/net/ipv6_stubs.h +++ /dev/null @@ -1,80 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _IPV6_STUBS_H -#define _IPV6_STUBS_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/* structs from net/ip6_fib.h */ -struct fib6_info; -struct fib6_nh; -struct fib6_config; -struct fib6_result; - -/* This is ugly, ideally these symbols should be built - * into the core kernel. - */ -struct ipv6_stub { - int (*ipv6_sock_mc_join)(struct sock *sk, int ifindex, - const struct in6_addr *addr); - int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex, - const struct in6_addr *addr); - struct dst_entry *(*ipv6_dst_lookup_flow)(struct net *net, - const struct sock *sk, - struct flowi6 *fl6, - const struct in6_addr *final_dst); - int (*ipv6_route_input)(struct sk_buff *skb); - - struct fib6_table *(*fib6_get_table)(struct net *net, u32 id); - int (*fib6_lookup)(struct net *net, int oif, struct flowi6 *fl6, - struct fib6_result *res, int flags); - int (*fib6_table_lookup)(struct net *net, struct fib6_table *table, - int oif, struct flowi6 *fl6, - struct fib6_result *res, int flags); - void (*fib6_select_path)(const struct net *net, struct fib6_result *res, - struct flowi6 *fl6, int oif, bool oif_match, - const struct sk_buff *skb, int strict); - u32 (*ip6_mtu_from_fib6)(const struct fib6_result *res, - const struct in6_addr *daddr, - const struct in6_addr *saddr); - - int (*fib6_nh_init)(struct net *net, struct fib6_nh *fib6_nh, - struct fib6_config *cfg, gfp_t gfp_flags, - struct netlink_ext_ack *extack); - void (*fib6_nh_release)(struct fib6_nh *fib6_nh); - void (*fib6_nh_release_dsts)(struct fib6_nh *fib6_nh); - void (*fib6_update_sernum)(struct net *net, struct fib6_info *rt); - int (*ip6_del_rt)(struct net *net, struct fib6_info *rt, bool skip_notify= ); - void (*fib6_rt_update)(struct net *net, struct fib6_info *rt, - struct nl_info *info); - - void (*udpv6_encap_enable)(void); - void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *dadd= r, - const struct in6_addr *solicited_addr, - bool router, bool solicited, bool override, bool inc_opt); -#if IS_ENABLED(CONFIG_XFRM) - void (*xfrm6_local_rxpmtu)(struct sk_buff *skb, u32 mtu); - int (*xfrm6_udp_encap_rcv)(struct sock *sk, struct sk_buff *skb); - struct sk_buff *(*xfrm6_gro_udp_encap_rcv)(struct sock *sk, - struct list_head *head, - struct sk_buff *skb); - int (*xfrm6_rcv_encap)(struct sk_buff *skb, int nexthdr, __be32 spi, - int encap_type); -#endif - struct neigh_table *nd_tbl; - - int (*ipv6_fragment)(struct net *net, struct sock *sk, struct sk_buff *sk= b, - int (*output)(struct net *, struct sock *, struct sk_buff *)); - struct net_device *(*ipv6_dev_find)(struct net *net, const struct in6_add= r *addr, - struct net_device *dev); - int (*ip6_xmit)(const struct sock *sk, struct sk_buff *skb, struct flowi6= *fl6, - __u32 mark, struct ipv6_txoptions *opt, int tclass, u32 priority); -}; -extern const struct ipv6_stub *ipv6_stub __read_mostly; -#endif diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 6152401f29f1..5c64562cc69f 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -2,8 +2,6 @@ #ifndef _NDISC_H #define _NDISC_H =20 -#include - /* * ICMP codes for neighbour discovery messages */ @@ -366,14 +364,6 @@ static inline struct neighbour *__ipv6_neigh_lookup_no= ref(struct net_device *dev ndisc_hashfn, pkey, dev); } =20 -static inline -struct neighbour *__ipv6_neigh_lookup_noref_stub(struct net_device *dev, - const void *pkey) -{ - return ___neigh_lookup_noref(ipv6_stub->nd_tbl, neigh_key_eq128, - ndisc_hashfn, pkey, dev); -} - static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev= , const void *pkey) { struct neighbour *n; @@ -398,27 +388,15 @@ static inline void __ipv6_confirm_neigh(struct net_de= vice *dev, rcu_read_unlock(); } =20 -static inline void __ipv6_confirm_neigh_stub(struct net_device *dev, - const void *pkey) -{ - struct neighbour *n; - - rcu_read_lock(); - n =3D __ipv6_neigh_lookup_noref_stub(dev, pkey); - neigh_confirm(n); - rcu_read_unlock(); -} - -/* uses ipv6_stub and is meant for use outside of IPv6 core */ static inline struct neighbour *ip_neigh_gw6(struct net_device *dev, const void *addr) { #if IS_ENABLED(CONFIG_IPV6) struct neighbour *neigh; =20 - neigh =3D __ipv6_neigh_lookup_noref_stub(dev, addr); + neigh =3D __ipv6_neigh_lookup_noref(dev, addr); if (unlikely(!neigh)) - neigh =3D __neigh_create(ipv6_stub->nd_tbl, addr, dev, false); + neigh =3D __neigh_create(ipv6_get_nd_tbl(), addr, dev, false); =20 return neigh; #else @@ -445,6 +423,7 @@ void ndisc_send_skb(struct sk_buff *skb, const struct i= n6_addr *daddr, =20 void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr, const struct in6_addr *daddr); + void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, const struct in6_addr *solicited_addr, bool router, bool solicited, bool override, bool inc_opt); diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 277f1ce1c02d..095f49f741de 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -7,7 +7,6 @@ =20 #if IS_ENABLED(CONFIG_IPV6) #include -#include #endif =20 #define UDP_TUNNEL_PARTIAL_FEATURES NETIF_F_GSO_ENCAP_ALL diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 0e55f139e05d..e022c375f418 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -399,7 +399,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device= *dev) =20 ndev->cnf.mtu6 =3D dev->mtu; ndev->ra_mtu =3D 0; - ndev->nd_parms =3D neigh_parms_alloc(dev, &nd_tbl); + ndev->nd_parms =3D neigh_parms_alloc(dev, ipv6_get_nd_tbl()); if (!ndev->nd_parms) { kfree(ndev); return ERR_PTR(err); @@ -412,7 +412,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device= *dev) if (snmp6_alloc_dev(ndev) < 0) { netdev_dbg(dev, "%s: cannot allocate memory for statistics\n", __func__); - neigh_parms_release(&nd_tbl, ndev->nd_parms); + neigh_parms_release(ipv6_get_nd_tbl(), ndev->nd_parms); netdev_put(dev, &ndev->dev_tracker); kfree(ndev); return ERR_PTR(err); @@ -480,7 +480,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device= *dev) return ndev; =20 err_release: - neigh_parms_release(&nd_tbl, ndev->nd_parms); + neigh_parms_release(ipv6_get_nd_tbl(), ndev->nd_parms); ndev->dead =3D 1; in6_dev_finish_destroy(ndev); return ERR_PTR(err); @@ -4008,8 +4008,8 @@ static int addrconf_ifdown(struct net_device *dev, bo= ol unregister) /* Last: Shot the device (if unregistered) */ if (unregister) { addrconf_sysctl_unregister(idev); - neigh_parms_release(&nd_tbl, idev->nd_parms); - neigh_ifdown(&nd_tbl, dev); + neigh_parms_release(ipv6_get_nd_tbl(), idev->nd_parms); + neigh_ifdown(ipv6_get_nd_tbl(), dev); in6_dev_put(idev); } return 0; diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c index c008d21925d7..fa27a90ab3cd 100644 --- a/net/ipv6/addrconf_core.c +++ b/net/ipv6/addrconf_core.c @@ -6,7 +6,6 @@ =20 #include #include -#include #include #include =20 @@ -129,96 +128,6 @@ int inet6addr_validator_notifier_call_chain(unsigned l= ong val, void *v) } EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain); =20 -static struct dst_entry *eafnosupport_ipv6_dst_lookup_flow(struct net *net, - const struct sock *sk, - struct flowi6 *fl6, - const struct in6_addr *final_dst) -{ - return ERR_PTR(-EAFNOSUPPORT); -} - -static int eafnosupport_ipv6_route_input(struct sk_buff *skb) -{ - return -EAFNOSUPPORT; -} - -static struct fib6_table *eafnosupport_fib6_get_table(struct net *net, u32= id) -{ - return NULL; -} - -static int -eafnosupport_fib6_table_lookup(struct net *net, struct fib6_table *table, - int oif, struct flowi6 *fl6, - struct fib6_result *res, int flags) -{ - return -EAFNOSUPPORT; -} - -static int -eafnosupport_fib6_lookup(struct net *net, int oif, struct flowi6 *fl6, - struct fib6_result *res, int flags) -{ - return -EAFNOSUPPORT; -} - -static void -eafnosupport_fib6_select_path(const struct net *net, struct fib6_result *r= es, - struct flowi6 *fl6, int oif, bool have_oif_match, - const struct sk_buff *skb, int strict) -{ -} - -static u32 -eafnosupport_ip6_mtu_from_fib6(const struct fib6_result *res, - const struct in6_addr *daddr, - const struct in6_addr *saddr) -{ - return 0; -} - -static int eafnosupport_fib6_nh_init(struct net *net, struct fib6_nh *fib6= _nh, - struct fib6_config *cfg, gfp_t gfp_flags, - struct netlink_ext_ack *extack) -{ - NL_SET_ERR_MSG(extack, "IPv6 support not enabled in kernel"); - return -EAFNOSUPPORT; -} - -static int eafnosupport_ip6_del_rt(struct net *net, struct fib6_info *rt, - bool skip_notify) -{ - return -EAFNOSUPPORT; -} - -static int eafnosupport_ipv6_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, - int (*output)(struct net *, struct sock *, struct sk_buff *)) -{ - kfree_skb(skb); - return -EAFNOSUPPORT; -} - -static struct net_device *eafnosupport_ipv6_dev_find(struct net *net, cons= t struct in6_addr *addr, - struct net_device *dev) -{ - return ERR_PTR(-EAFNOSUPPORT); -} - -const struct ipv6_stub *ipv6_stub __read_mostly =3D &(struct ipv6_stub) { - .ipv6_dst_lookup_flow =3D eafnosupport_ipv6_dst_lookup_flow, - .ipv6_route_input =3D eafnosupport_ipv6_route_input, - .fib6_get_table =3D eafnosupport_fib6_get_table, - .fib6_table_lookup =3D eafnosupport_fib6_table_lookup, - .fib6_lookup =3D eafnosupport_fib6_lookup, - .fib6_select_path =3D eafnosupport_fib6_select_path, - .ip6_mtu_from_fib6 =3D eafnosupport_ip6_mtu_from_fib6, - .fib6_nh_init =3D eafnosupport_fib6_nh_init, - .ip6_del_rt =3D eafnosupport_ip6_del_rt, - .ipv6_fragment =3D eafnosupport_ipv6_fragment, - .ipv6_dev_find =3D eafnosupport_ipv6_dev_find, -}; -EXPORT_SYMBOL_GPL(ipv6_stub); - /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */ const struct in6_addr in6addr_loopback __aligned(BITS_PER_LONG/8) =3D IN6ADDR_LOOPBACK_INIT; diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 07ae6ea7743a..33abd8d8cd7d 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #ifdef CONFIG_IPV6_TUNNEL #include @@ -996,42 +995,6 @@ static struct pernet_operations inet6_net_ops =3D { .exit =3D inet6_net_exit, }; =20 -static int ipv6_route_input(struct sk_buff *skb) -{ - ip6_route_input(skb); - return skb_dst(skb)->error; -} - -static const struct ipv6_stub ipv6_stub_impl =3D { - .ipv6_sock_mc_join =3D ipv6_sock_mc_join, - .ipv6_sock_mc_drop =3D ipv6_sock_mc_drop, - .ipv6_dst_lookup_flow =3D ip6_dst_lookup_flow, - .ipv6_route_input =3D ipv6_route_input, - .fib6_get_table =3D fib6_get_table, - .fib6_table_lookup =3D fib6_table_lookup, - .fib6_lookup =3D fib6_lookup, - .fib6_select_path =3D fib6_select_path, - .ip6_mtu_from_fib6 =3D ip6_mtu_from_fib6, - .fib6_nh_init =3D fib6_nh_init, - .fib6_nh_release =3D fib6_nh_release, - .fib6_nh_release_dsts =3D fib6_nh_release_dsts, - .fib6_update_sernum =3D fib6_update_sernum_stub, - .fib6_rt_update =3D fib6_rt_update, - .ip6_del_rt =3D ip6_del_rt, - .udpv6_encap_enable =3D udpv6_encap_enable, - .ndisc_send_na =3D ndisc_send_na, -#if IS_ENABLED(CONFIG_XFRM) - .xfrm6_local_rxpmtu =3D xfrm6_local_rxpmtu, - .xfrm6_udp_encap_rcv =3D xfrm6_udp_encap_rcv, - .xfrm6_gro_udp_encap_rcv =3D xfrm6_gro_udp_encap_rcv, - .xfrm6_rcv_encap =3D xfrm6_rcv_encap, -#endif - .nd_tbl =3D &nd_tbl, - .ipv6_fragment =3D ip6_fragment, - .ipv6_dev_find =3D ipv6_dev_find, - .ip6_xmit =3D ip6_xmit, -}; - static int __init inet6_init(void) { struct list_head *r; @@ -1188,9 +1151,6 @@ static int __init inet6_init(void) goto sysctl_fail; #endif =20 - /* ensure that ipv6 stubs are visible only after ipv6 is ready */ - wmb(); - ipv6_stub =3D &ipv6_stub_impl; out: return err; =20 diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 0fc6ef4a48b1..8a6aabb58c5f 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1408,14 +1408,6 @@ void fib6_update_sernum_upto_root(struct net *net, s= truct fib6_info *rt) __fib6_update_sernum_upto_root(rt, fib6_new_sernum(net)); } =20 -/* allow ipv4 to update sernum via ipv6_stub */ -void fib6_update_sernum_stub(struct net *net, struct fib6_info *f6i) -{ - spin_lock_bh(&f6i->fib6_table->tb6_lock); - fib6_update_sernum_upto_root(net, f6i); - spin_unlock_bh(&f6i->fib6_table->tb6_lock); -} - /* * Add routing information to the routing tree. * / diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 315808dc2a07..433b8ab395bd 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -125,7 +125,7 @@ static int ip6_finish_output2(struct net *net, struct s= ock *sk, struct sk_buff * =20 if (IS_ERR_OR_NULL(neigh)) { if (unlikely(!neigh)) - neigh =3D __neigh_create(&nd_tbl, nexthop, dev, false); + neigh =3D __neigh_create(ipv6_get_nd_tbl(), nexthop, dev, false); if (IS_ERR(neigh)) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTNOROUTES); kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_CREATEFAIL); @@ -559,7 +559,7 @@ int ip6_forward(struct sk_buff *skb) =20 /* XXX: idev->cnf.proxy_ndp? */ if (READ_ONCE(net->ipv6.devconf_all->proxy_ndp) && - pneigh_lookup(&nd_tbl, net, &hdr->daddr, skb->dev)) { + pneigh_lookup(ipv6_get_nd_tbl(), net, &hdr->daddr, skb->dev)) { int proxied =3D ip6_forward_proxy_check(skb); if (proxied > 0) { /* It's tempting to decrease the hop limit diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c index cef3e0210744..405ef1cb8864 100644 --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -162,8 +162,7 @@ struct dst_entry *udp_tunnel6_dst_lookup(struct sk_buff= *skb, fl6.fl6_dport =3D dport; fl6.flowlabel =3D ip6_make_flowinfo(dsfield, key->label); =20 - dst =3D ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6, - NULL); + dst =3D ip6_dst_lookup_flow(net, sock->sk, &fl6, NULL); if (IS_ERR(dst)) { netdev_dbg(dev, "no route to %pI6\n", &fl6.daddr); return ERR_PTR(-ENETUNREACH); diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index f76fb8a85452..918443c75288 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -120,7 +120,7 @@ struct neigh_table nd_tbl =3D { .allow_add =3D ndisc_allow_add, .id =3D "ndisc_cache", .parms =3D { - .tbl =3D &nd_tbl, + .tbl =3D ipv6_get_nd_tbl(), .reachable_time =3D ND_REACHABLE_TIME, .data =3D { [NEIGH_VAR_MCAST_PROBES] =3D 3, @@ -769,7 +769,7 @@ static int pndisc_is_router(const void *pkey, struct pneigh_entry *n; int ret =3D -1; =20 - n =3D pneigh_lookup(&nd_tbl, dev_net(dev), pkey, dev); + n =3D pneigh_lookup(ipv6_get_nd_tbl(), dev_net(dev), pkey, dev); if (n) ret =3D !!(READ_ONCE(n->flags) & NTF_ROUTER); =20 @@ -917,7 +917,7 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_buf= f *skb) */ struct sk_buff *n =3D skb_clone(skb, GFP_ATOMIC); if (n) - pneigh_enqueue(&nd_tbl, idev->nd_parms, n); + pneigh_enqueue(ipv6_get_nd_tbl(), idev->nd_parms, n); goto out; } } else { @@ -936,15 +936,15 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_b= uff *skb) } =20 if (inc) - NEIGH_CACHE_STAT_INC(&nd_tbl, rcv_probes_mcast); + NEIGH_CACHE_STAT_INC(ipv6_get_nd_tbl(), rcv_probes_mcast); else - NEIGH_CACHE_STAT_INC(&nd_tbl, rcv_probes_ucast); + NEIGH_CACHE_STAT_INC(ipv6_get_nd_tbl(), rcv_probes_ucast); =20 /* * update / create cache entry * for the source address */ - neigh =3D __neigh_lookup(&nd_tbl, saddr, dev, + neigh =3D __neigh_lookup(ipv6_get_nd_tbl(), saddr, dev, !inc || lladdr || !dev->addr_len); if (neigh) ndisc_update(dev, neigh, lladdr, NUD_STALE, @@ -1059,7 +1059,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_b= uff *skb) return reason; } =20 - neigh =3D neigh_lookup(&nd_tbl, &msg->target, dev); + neigh =3D neigh_lookup(ipv6_get_nd_tbl(), &msg->target, dev); =20 /* RFC 9131 updates original Neighbour Discovery RFC 4861. * NAs with Target LL Address option without a corresponding @@ -1079,7 +1079,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_b= uff *skb) new_state =3D msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE; if (!neigh && lladdr && idev && READ_ONCE(idev->cnf.forwarding)) { if (accept_untracked_na(dev, saddr)) { - neigh =3D neigh_create(&nd_tbl, &msg->target, dev); + neigh =3D neigh_create(ipv6_get_nd_tbl(), &msg->target, dev); new_state =3D NUD_STALE; } } @@ -1099,7 +1099,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_b= uff *skb) if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) && READ_ONCE(net->ipv6.devconf_all->forwarding) && READ_ONCE(net->ipv6.devconf_all->proxy_ndp) && - pneigh_lookup(&nd_tbl, net, &msg->target, dev)) { + pneigh_lookup(ipv6_get_nd_tbl(), net, &msg->target, dev)) { /* XXX: idev->cnf.proxy_ndp */ goto out; } @@ -1167,7 +1167,7 @@ static enum skb_drop_reason ndisc_recv_rs(struct sk_b= uff *skb) goto out; } =20 - neigh =3D __neigh_lookup(&nd_tbl, saddr, skb->dev, 1); + neigh =3D __neigh_lookup(ipv6_get_nd_tbl(), saddr, skb->dev, 1); if (neigh) { ndisc_update(skb->dev, neigh, lladdr, NUD_STALE, NEIGH_UPDATE_F_WEAK_OVERRIDE| @@ -1464,7 +1464,7 @@ static enum skb_drop_reason ndisc_router_discovery(st= ruct sk_buff *skb) */ =20 if (!neigh) - neigh =3D __neigh_lookup(&nd_tbl, &ipv6_hdr(skb)->saddr, + neigh =3D __neigh_lookup(ipv6_get_nd_tbl(), &ipv6_hdr(skb)->saddr, skb->dev, 1); if (neigh) { u8 *lladdr =3D NULL; @@ -1860,7 +1860,7 @@ static int ndisc_netdev_event(struct notifier_block *= this, unsigned long event, =20 switch (event) { case NETDEV_CHANGEADDR: - neigh_changeaddr(&nd_tbl, dev); + neigh_changeaddr(ipv6_get_nd_tbl(), dev); fib6_run_gc(0, net, false); fallthrough; case NETDEV_UP: @@ -1884,12 +1884,12 @@ static int ndisc_netdev_event(struct notifier_block= *this, unsigned long event, =20 change_info =3D ptr; if (change_info->flags_changed & IFF_NOARP) - neigh_changeaddr(&nd_tbl, dev); + neigh_changeaddr(ipv6_get_nd_tbl(), dev); if (evict_nocarrier && !netif_carrier_ok(dev)) - neigh_carrier_down(&nd_tbl, dev); + neigh_carrier_down(ipv6_get_nd_tbl(), dev); break; case NETDEV_DOWN: - neigh_ifdown(&nd_tbl, dev); + neigh_ifdown(ipv6_get_nd_tbl(), dev); fib6_run_gc(0, net, false); break; case NETDEV_NOTIFY_PEERS: @@ -2006,7 +2006,7 @@ int __init ndisc_init(void) /* * Initialize the neighbour table */ - neigh_table_init(NEIGH_ND_TABLE, &nd_tbl); + neigh_table_init(NEIGH_ND_TABLE, ipv6_get_nd_tbl()); =20 #ifdef CONFIG_SYSCTL err =3D neigh_sysctl_register(NULL, &nd_tbl.parms, @@ -2039,6 +2039,6 @@ void ndisc_cleanup(void) #ifdef CONFIG_SYSCTL neigh_sysctl_unregister(&nd_tbl.parms); #endif - neigh_table_clear(NEIGH_ND_TABLE, &nd_tbl); + neigh_table_clear(NEIGH_ND_TABLE, ipv6_get_nd_tbl()); unregister_pernet_subsys(&ndisc_net_ops); } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b66a2f791e3f..7809cb9db7a1 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -217,7 +217,7 @@ struct neighbour *ip6_neigh_lookup(const struct in6_add= r *gw, if (n) return n; =20 - n =3D neigh_create(&nd_tbl, daddr, dev); + n =3D neigh_create(ipv6_get_nd_tbl(), daddr, dev); return IS_ERR(n) ? NULL : n; } =20 @@ -4287,7 +4287,7 @@ static void rt6_do_redirect(struct dst_entry *dst, st= ruct sock *sk, struct sk_bu */ dst_confirm_neigh(&rt->dst, &ipv6_hdr(skb)->saddr); =20 - neigh =3D __neigh_lookup(&nd_tbl, &msg->target, skb->dev, 1); + neigh =3D __neigh_lookup(ipv6_get_nd_tbl(), &msg->target, skb->dev, 1); if (!neigh) return; =20 @@ -5017,7 +5017,7 @@ void rt6_disable_ip(struct net_device *dev, unsigned = long event) { rt6_sync_down_dev(dev, event); rt6_uncached_list_flush_dev(dev); - neigh_ifdown(&nd_tbl, dev); + neigh_ifdown(ipv6_get_nd_tbl(), dev); } =20 struct rt6_mtu_change_arg { --=20 2.53.0 From nobody Mon Apr 6 23:16:47 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DB373E8665 for ; Tue, 17 Mar 2026 14:04:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756262; cv=none; b=pVrdmee5sE7zXdXhwx6/UvhX3/Ng+iEAVeWCIjCRSLCTjLn8C2dYC8LMDOR4NRhExssQcTwZ0fytwV7agb0rt1BYxhnYCWrXMgvEJEF2zIYMUhn50x5K82Fw/YLhP+c0ZtbfJhaO5DDnqthToD4vAZj83W2Y0kL225OLEWYN5ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756262; c=relaxed/simple; bh=f+GDNcSUStXGIn4wg5mFi4Tfes17h8SsuyaWtRUsTWw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TUPBxbWzeSLH9wlqbuxUzYVyruVwHI777COAE3FYS8Yz9/rA/0OnF4J0T+taa+mcjrOgLaCdtAD4PNNiS1UfJNj3r694+EqOaI7uxXd1i1h5Y/TS9vVkUG37VUW0v8MFL9A0jO3NvFnDn4EKH3I+x3SYlB7YML0/VZhQ9wM4Pdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ZiZitdjI; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ogC0PSYs; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Bmo3E/RE; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=T7o2Ooaj; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ZiZitdjI"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ogC0PSYs"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Bmo3E/RE"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="T7o2Ooaj" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DB2B74D2B2; Tue, 17 Mar 2026 14:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756259; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7JPRMc8Ci3PGSq32TTfjunwbbQOsAtAnFSWWqn0ocY=; b=ZiZitdjICpz15CWQDPMbwJbWnLJiMlQ0nzgJ1yaKTdKze1kR+TghjLroPEk4+0oI/jyu9Z jnF7E8GYlLdFz/8aIUBmgr3m0PzEtxIjyPsdA8z4dqWZeLcVGgzQvsy4oPh9Y6u4PeRxnO WEKoHHMPcVul1ZrpKWSRBi/sBH51V5E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756259; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7JPRMc8Ci3PGSq32TTfjunwbbQOsAtAnFSWWqn0ocY=; b=ogC0PSYs/zBskEDJAAd3FGkUuJHjYF6NErZcugVngKMv4Yc4kikfEGj1e3jSDVmDZRRJsF UCxsJqgWr70FVkAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773756257; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7JPRMc8Ci3PGSq32TTfjunwbbQOsAtAnFSWWqn0ocY=; b=Bmo3E/REE5zrylgY+/830Va6slHksBNq+lnJnP7ruSuLUKLiLqvvQW2jvU7bk41pAr0mA6 ZW+m2SKxSpW3kRTnQxCE8xaoTZ5GMLyrvgZXvP3LhgkxGZHfGXzdiG0nuWEJz5ZocAGJgV s6YTkwbu3S/pOc0wGp/1Had8DjMeFRc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773756257; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7JPRMc8Ci3PGSq32TTfjunwbbQOsAtAnFSWWqn0ocY=; b=T7o2OoajQcVYkhe88dUL52uX9c74i6/Hg4KIqMIJM6cpSU2Jm3VLpLZU2+uw4BOuh1huqV k94nXGKUlJrTWsCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D11784273B; Tue, 17 Mar 2026 14:04:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IHz8L2BfuWmpYwAAD6G6ig (envelope-from ); Tue, 17 Mar 2026 14:04:16 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: Fernando Fernandez Mancera , =?UTF-8?q?Ricardo=20B=2E=20Marli=C3=A8re?= , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Nikolay Aleksandrov , Ido Schimmel , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org, bridge@lists.linux.dev Subject: [PATCH 10/10 net-next v3] netfilter: remove nf_ipv6_ops and use direct function calls Date: Tue, 17 Mar 2026 15:01:06 +0100 Message-ID: <20260317140141.5723-11-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260317140141.5723-1-fmancera@suse.de> References: <20260317140141.5723-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-7.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[18]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,suse.com:email,imap1.dmz-prg2.suse.org:helo] X-Spam-Flag: NO X-Spam-Score: -7.30 X-Spam-Level: As IPv6 is built-in only, nf_ipv6_ops can be removed completely as it is not longer necessary. Convert all nf_ipv6_ops usage to direct function calls instead. In addition, remove the ipv6_netfilter_init/fini() functions as they are not necessary any longer. Signed-off-by: Fernando Fernandez Mancera Tested-by: Ricardo B. Marli=C3=A8re --- include/linux/netfilter_ipv6.h | 102 ++---------------------------- include/net/ip.h | 5 -- net/bridge/br_netfilter_hooks.c | 12 +--- net/bridge/br_netfilter_ipv6.c | 7 +- net/ipv6/af_inet6.c | 6 -- net/ipv6/netfilter.c | 48 -------------- net/netfilter/core.c | 3 - net/netfilter/nf_nat_masquerade.c | 21 +----- net/netfilter/nfnetlink_queue.c | 22 +++++-- net/netfilter/utils.c | 1 - 10 files changed, 32 insertions(+), 195 deletions(-) diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h index 61aa48f46dd7..5ce45b6d890f 100644 --- a/include/linux/netfilter_ipv6.h +++ b/include/linux/netfilter_ipv6.h @@ -34,59 +34,13 @@ struct ip6_rt_info { struct nf_queue_entry; struct nf_bridge_frag_data; =20 -/* - * Hook functions for ipv6 to allow xt_* modules to be built-in even - * if IPv6 is a module. - */ -struct nf_ipv6_ops { -#if IS_MODULE(CONFIG_IPV6) - int (*chk_addr)(struct net *net, const struct in6_addr *addr, - const struct net_device *dev, int strict); - int (*route_me_harder)(struct net *net, struct sock *sk, struct sk_buff *= skb); - int (*dev_get_saddr)(struct net *net, const struct net_device *dev, - const struct in6_addr *daddr, unsigned int srcprefs, - struct in6_addr *saddr); - int (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl, - bool strict); - u32 (*cookie_init_sequence)(const struct ipv6hdr *iph, - const struct tcphdr *th, u16 *mssp); - int (*cookie_v6_check)(const struct ipv6hdr *iph, - const struct tcphdr *th); -#endif - void (*route_input)(struct sk_buff *skb); - int (*fragment)(struct net *net, struct sock *sk, struct sk_buff *skb, - int (*output)(struct net *, struct sock *, struct sk_buff *)); - int (*reroute)(struct sk_buff *skb, const struct nf_queue_entry *entry); -#if IS_MODULE(CONFIG_IPV6) - int (*br_fragment)(struct net *net, struct sock *sk, - struct sk_buff *skb, - struct nf_bridge_frag_data *data, - int (*output)(struct net *, struct sock *sk, - const struct nf_bridge_frag_data *data, - struct sk_buff *)); -#endif -}; - #ifdef CONFIG_NETFILTER #include =20 -extern const struct nf_ipv6_ops __rcu *nf_ipv6_ops; -static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void) -{ - return rcu_dereference(nf_ipv6_ops); -} - static inline int nf_ipv6_chk_addr(struct net *net, const struct in6_addr = *addr, const struct net_device *dev, int strict) { -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (!v6_ops) - return 1; - - return v6_ops->chk_addr(net, addr, dev, strict); -#elif IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) return ipv6_chk_addr(net, addr, dev, strict); #else return 1; @@ -99,15 +53,7 @@ int __nf_ip6_route(struct net *net, struct dst_entry **d= st, static inline int nf_ip6_route(struct net *net, struct dst_entry **dst, struct flowi *fl, bool strict) { -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6ops =3D nf_get_ipv6_ops(); - - if (v6ops) - return v6ops->route(net, dst, fl, strict); - - return -EHOSTUNREACH; -#endif -#if IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) return __nf_ip6_route(net, dst, fl, strict); #else return -EHOSTUNREACH; @@ -129,14 +75,7 @@ static inline int nf_br_ip6_fragment(struct net *net, s= truct sock *sk, const struct nf_bridge_frag_data *data, struct sk_buff *)) { -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (!v6_ops) - return 1; - - return v6_ops->br_fragment(net, sk, skb, data, output); -#elif IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) return br_ip6_fragment(net, sk, skb, data, output); #else return 1; @@ -147,14 +86,7 @@ int ip6_route_me_harder(struct net *net, struct sock *s= k, struct sk_buff *skb); =20 static inline int nf_ip6_route_me_harder(struct net *net, struct sock *sk,= struct sk_buff *skb) { -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (!v6_ops) - return -EHOSTUNREACH; - - return v6_ops->route_me_harder(net, sk, skb); -#elif IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) return ip6_route_me_harder(net, sk, skb); #else return -EHOSTUNREACH; @@ -165,15 +97,8 @@ static inline u32 nf_ipv6_cookie_init_sequence(const st= ruct ipv6hdr *iph, const struct tcphdr *th, u16 *mssp) { -#if IS_ENABLED(CONFIG_SYN_COOKIES) -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (v6_ops) - return v6_ops->cookie_init_sequence(iph, th, mssp); -#elif IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) && IS_ENABLED(CONFIG_SYN_COOKIES) return __cookie_v6_init_sequence(iph, th, mssp); -#endif #endif return 0; } @@ -181,15 +106,8 @@ static inline u32 nf_ipv6_cookie_init_sequence(const s= truct ipv6hdr *iph, static inline int nf_cookie_v6_check(const struct ipv6hdr *iph, const struct tcphdr *th) { -#if IS_ENABLED(CONFIG_SYN_COOKIES) -#if IS_MODULE(CONFIG_IPV6) - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (v6_ops) - return v6_ops->cookie_v6_check(iph, th); -#elif IS_BUILTIN(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IPV6) && IS_ENABLED(CONFIG_SYN_COOKIES) return __cookie_v6_check(iph, th); -#endif #endif return 0; } @@ -198,14 +116,6 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned = int hook, unsigned int dataoff, u_int8_t protocol); =20 int nf_ip6_check_hbh_len(struct sk_buff *skb, u32 *plen); - -int ipv6_netfilter_init(void); -void ipv6_netfilter_fini(void); - -#else /* CONFIG_NETFILTER */ -static inline int ipv6_netfilter_init(void) { return 0; } -static inline void ipv6_netfilter_fini(void) { return; } -static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void) { return NUL= L; } #endif /* CONFIG_NETFILTER */ =20 #endif /*__LINUX_IP6_NETFILTER_H*/ diff --git a/include/net/ip.h b/include/net/ip.h index f39a3787fedd..40aac82ea212 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -692,13 +692,8 @@ static __inline__ void inet_reset_saddr(struct sock *s= k) =20 #endif =20 -#if IS_MODULE(CONFIG_IPV6) -#define EXPORT_IPV6_MOD(X) EXPORT_SYMBOL(X) -#define EXPORT_IPV6_MOD_GPL(X) EXPORT_SYMBOL_GPL(X) -#else #define EXPORT_IPV6_MOD(X) #define EXPORT_IPV6_MOD_GPL(X) -#endif =20 static inline unsigned int ipv4_addr_hash(__be32 ip) { diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hook= s.c index 083e2fe96441..0ab1c94db4b9 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -32,6 +32,7 @@ =20 #include #include +#include #include #include #include @@ -890,7 +891,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct= sock *sk, struct sk_buff } if (IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) && skb->protocol =3D=3D htons(ETH_P_IPV6)) { - const struct nf_ipv6_ops *v6ops =3D nf_get_ipv6_ops(); struct brnf_frag_data *data; =20 if (br_validate_ipv6(net, skb)) @@ -906,15 +906,9 @@ static int br_nf_dev_queue_xmit(struct net *net, struc= t sock *sk, struct sk_buff skb_copy_from_linear_data_offset(skb, -data->size, data->mac, data->size); =20 - if (v6ops) { - ret =3D v6ops->fragment(net, sk, skb, br_nf_push_frag_xmit); - local_unlock_nested_bh(&brnf_frag_data_storage.bh_lock); - return ret; - } + ret =3D ip6_fragment(net, sk, skb, br_nf_push_frag_xmit); local_unlock_nested_bh(&brnf_frag_data_storage.bh_lock); - - kfree_skb(skb); - return -EMSGSIZE; + return ret; } nf_bridge_info_free(skb); return br_dev_queue_push_xmit(net, sk, skb); diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c index 76ce70b4e7f3..d8548428929e 100644 --- a/net/bridge/br_netfilter_ipv6.c +++ b/net/bridge/br_netfilter_ipv6.c @@ -30,6 +30,7 @@ =20 #include #include +#include #include #include #include @@ -95,15 +96,13 @@ br_nf_ipv6_daddr_was_changed(const struct sk_buff *skb, =20 /* PF_BRIDGE/PRE_ROUTING: Undo the changes made for ip6tables * PREROUTING and continue the bridge PRE_ROUTING hook. See comment - * for br_nf_pre_routing_finish(), same logic is used here but - * equivalent IPv6 function ip6_route_input() called indirectly. + * for br_nf_pre_routing_finish(), same logic is used here. */ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk,= struct sk_buff *skb) { struct nf_bridge_info *nf_bridge =3D nf_bridge_info_get(skb); struct rtable *rt; struct net_device *dev =3D skb->dev, *br_indev; - const struct nf_ipv6_ops *v6ops =3D nf_get_ipv6_ops(); =20 br_indev =3D nf_bridge_get_physindev(skb, net); if (!br_indev) { @@ -120,7 +119,7 @@ static int br_nf_pre_routing_finish_ipv6(struct net *ne= t, struct sock *sk, struc nf_bridge->in_prerouting =3D 0; if (br_nf_ipv6_daddr_was_changed(skb, nf_bridge)) { skb_dst_drop(skb); - v6ops->route_input(skb); + ip6_route_input(skb); =20 if (skb_dst(skb)->error) { kfree_skb(skb); diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 33abd8d8cd7d..ee341a8254bf 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -38,7 +38,6 @@ #include #include #include -#include =20 #include #include @@ -1066,9 +1065,6 @@ static int __init inet6_init(void) if (err) goto igmp_fail; =20 - err =3D ipv6_netfilter_init(); - if (err) - goto netfilter_fail; /* Create /proc/foo6 entries. */ #ifdef CONFIG_PROC_FS err =3D -ENOMEM; @@ -1199,8 +1195,6 @@ static int __init inet6_init(void) raw6_proc_exit(); proc_raw6_fail: #endif - ipv6_netfilter_fini(); -netfilter_fail: igmp6_cleanup(); igmp_fail: ndisc_cleanup(); diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index c3dc90dfab80..6d80f85e55fa 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -86,21 +86,6 @@ int ip6_route_me_harder(struct net *net, struct sock *sk= _partial, struct sk_buff } EXPORT_SYMBOL(ip6_route_me_harder); =20 -static int nf_ip6_reroute(struct sk_buff *skb, - const struct nf_queue_entry *entry) -{ - struct ip6_rt_info *rt_info =3D nf_queue_entry_reroute(entry); - - if (entry->state.hook =3D=3D NF_INET_LOCAL_OUT) { - const struct ipv6hdr *iph =3D ipv6_hdr(skb); - if (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) || - !ipv6_addr_equal(&iph->saddr, &rt_info->saddr) || - skb->mark !=3D rt_info->mark) - return ip6_route_me_harder(entry->state.net, entry->state.sk, skb); - } - return 0; -} - int __nf_ip6_route(struct net *net, struct dst_entry **dst, struct flowi *fl, bool strict) { @@ -243,36 +228,3 @@ int br_ip6_fragment(struct net *net, struct sock *sk, = struct sk_buff *skb, return 0; } EXPORT_SYMBOL_GPL(br_ip6_fragment); - -static const struct nf_ipv6_ops ipv6ops =3D { -#if IS_MODULE(CONFIG_IPV6) - .chk_addr =3D ipv6_chk_addr, - .route_me_harder =3D ip6_route_me_harder, - .dev_get_saddr =3D ipv6_dev_get_saddr, - .route =3D __nf_ip6_route, -#if IS_ENABLED(CONFIG_SYN_COOKIES) - .cookie_init_sequence =3D __cookie_v6_init_sequence, - .cookie_v6_check =3D __cookie_v6_check, -#endif -#endif - .route_input =3D ip6_route_input, - .fragment =3D ip6_fragment, - .reroute =3D nf_ip6_reroute, -#if IS_MODULE(CONFIG_IPV6) - .br_fragment =3D br_ip6_fragment, -#endif -}; - -int __init ipv6_netfilter_init(void) -{ - RCU_INIT_POINTER(nf_ipv6_ops, &ipv6ops); - return 0; -} - -/* This can be called from inet6_init() on errors, so it cannot - * be marked __exit. -DaveM - */ -void ipv6_netfilter_fini(void) -{ - RCU_INIT_POINTER(nf_ipv6_ops, NULL); -} diff --git a/net/netfilter/core.c b/net/netfilter/core.c index d5df44ea9e7b..675a1034b340 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -27,9 +27,6 @@ =20 #include "nf_internals.h" =20 -const struct nf_ipv6_ops __rcu *nf_ipv6_ops __read_mostly; -EXPORT_SYMBOL_GPL(nf_ipv6_ops); - #ifdef CONFIG_JUMP_LABEL struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; EXPORT_SYMBOL(nf_hooks_needed); diff --git a/net/netfilter/nf_nat_masquerade.c b/net/netfilter/nf_nat_masqu= erade.c index a5a23c03fda9..4de6e0a51701 100644 --- a/net/netfilter/nf_nat_masquerade.c +++ b/net/netfilter/nf_nat_masquerade.c @@ -220,23 +220,6 @@ static struct notifier_block masq_inet_notifier =3D { }; =20 #if IS_ENABLED(CONFIG_IPV6) -static int -nat_ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, - const struct in6_addr *daddr, unsigned int srcprefs, - struct in6_addr *saddr) -{ -#ifdef CONFIG_IPV6_MODULE - const struct nf_ipv6_ops *v6_ops =3D nf_get_ipv6_ops(); - - if (!v6_ops) - return -EHOSTUNREACH; - - return v6_ops->dev_get_saddr(net, dev, daddr, srcprefs, saddr); -#else - return ipv6_dev_get_saddr(net, dev, daddr, srcprefs, saddr); -#endif -} - unsigned int nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *ra= nge, const struct net_device *out) @@ -251,8 +234,8 @@ nf_nat_masquerade_ipv6(struct sk_buff *skb, const struc= t nf_nat_range2 *range, WARN_ON(!(ct && (ctinfo =3D=3D IP_CT_NEW || ctinfo =3D=3D IP_CT_RELATED || ctinfo =3D=3D IP_CT_RELATED_REPLY))); =20 - if (nat_ipv6_dev_get_saddr(nf_ct_net(ct), out, - &ipv6_hdr(skb)->daddr, 0, &src) < 0) + if (ipv6_dev_get_saddr(nf_ct_net(ct), out, + &ipv6_hdr(skb)->daddr, 0, &src) < 0) return NF_DROP; =20 nat =3D nf_ct_nat_ext_add(ct); diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queu= e.c index a91ae07db059..2aa2380d976a 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -356,9 +356,25 @@ static int nf_ip_reroute(struct sk_buff *skb, const st= ruct nf_queue_entry *entry return 0; } =20 +static int nf_ip6_reroute(struct sk_buff *skb, + const struct nf_queue_entry *entry) +{ + struct ip6_rt_info *rt_info =3D nf_queue_entry_reroute(entry); + + if (entry->state.hook =3D=3D NF_INET_LOCAL_OUT) { + const struct ipv6hdr *iph =3D ipv6_hdr(skb); + + if (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) || + !ipv6_addr_equal(&iph->saddr, &rt_info->saddr) || + skb->mark !=3D rt_info->mark) + return nf_ip6_route_me_harder(entry->state.net, + entry->state.sk, skb); + } + return 0; +} + static int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry) { - const struct nf_ipv6_ops *v6ops; int ret =3D 0; =20 switch (entry->state.pf) { @@ -366,9 +382,7 @@ static int nf_reroute(struct sk_buff *skb, struct nf_qu= eue_entry *entry) ret =3D nf_ip_reroute(skb, entry); break; case AF_INET6: - v6ops =3D rcu_dereference(nf_ipv6_ops); - if (v6ops) - ret =3D v6ops->reroute(skb, entry); + ret =3D nf_ip6_reroute(skb, entry); break; } return ret; diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c index 008419db815a..29c4dcc362c7 100644 --- a/net/netfilter/utils.c +++ b/net/netfilter/utils.c @@ -163,7 +163,6 @@ EXPORT_SYMBOL_GPL(nf_checksum_partial); int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl, bool strict, unsigned short family) { - const struct nf_ipv6_ops *v6ops __maybe_unused; int ret =3D 0; =20 switch (family) { --=20 2.53.0