git: 3091d980f581 - main - netlink: add NETLINK to the DEFAULTS for each architecture

From: Alexander V. Chernikov <melifaro_at_FreeBSD.org>
Date: Sun, 02 Apr 2023 15:27:51 UTC 
The branch main has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=3091d980f581753f86df4155057b4ef23eb3ad27

commit 3091d980f581753f86df4155057b4ef23eb3ad27
Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2023-04-02 11:50:04 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-04-02 15:27:21 +0000

    netlink: add NETLINK to the DEFAULTS for each architecture
    
    NETLINK is going to replace rtsock and a number of other ioctl/sysctl interfaces.
    In-base utilies such as route(8), netstat(8) and soon ifconfig(8)
     are being converted to use netlink sockets as a transport between
     kernel and userland.
    In the current configuration, it still possible have the kernel
     without NETLINK (`nooptions NETLINK`) and use the aforementioned
     utilies by buidling the world with `WITHOUT_NETLINK` src.conf knob.
    However, this approach does not cover the cases when person unintentionally
     builds a custom kernel without netlink and tries to use the standard userland.
    
    This change adds `option NETLINK` to the default options for each
     architecture, fixing the custom kernel issue.
    For arm, this change uses `std.armv6` and `std.armv7` (netlink already in)
     instead of DEFAULTS.
    
    Reviewed By: imp
    Differential Revision: https://reviews.freebsd.org/D39339
---
 sys/amd64/conf/DEFAULTS    | 2 ++
 sys/amd64/conf/GENERIC     | 1 -
 sys/arm/conf/std.armv6     | 1 +
 sys/arm64/conf/DEFAULTS    | 2 ++
 sys/arm64/conf/std.arm64   | 1 -
 sys/i386/conf/DEFAULTS     | 2 ++
 sys/i386/conf/GENERIC      | 1 -
 sys/powerpc/conf/DEFAULTS  | 2 ++
 sys/powerpc/conf/GENERIC64 | 1 -
 sys/riscv/conf/DEFAULTS    | 2 ++
 sys/riscv/conf/GENERIC     | 1 -
 11 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 733823e931d6..bc8a268e1ea4 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -25,3 +25,5 @@ options 	GEOM_PART_GPT
 options 	CC_CUBIC		# include CUBIC congestion control
 
 options 	NEW_PCIB
+
+options 	NETLINK			# netlink(4) support
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 46c901300371..67463e1013f8 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -31,7 +31,6 @@ options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options 	NETLINK			# netlink(4) support
 options 	ROUTE_MPATH		# Multipath routing support
 options 	FIB_ALGO		# Modular fib lookups
 options 	TCP_OFFLOAD		# TCP offload
diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6
index 17087f30f4f1..eb61ca42bf9d 100644
--- a/sys/arm/conf/std.armv6
+++ b/sys/arm/conf/std.armv6
@@ -11,6 +11,7 @@ options 	CC_CUBIC		# include CUBIC congestion control
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 device		crypto			# core crypto support
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
+options 	NETLINK			# netlink(4) support
 options 	SCTP_SUPPORT		# Allow kldload of SCTP
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
diff --git a/sys/arm64/conf/DEFAULTS b/sys/arm64/conf/DEFAULTS
index db76185154e1..d55a957f4b5b 100644
--- a/sys/arm64/conf/DEFAULTS
+++ b/sys/arm64/conf/DEFAULTS
@@ -18,3 +18,5 @@ options 	CC_CUBIC		# include CUBIC congestion control
 
 options 	NEW_PCIB
 options 	INTRNG
+
+options 	NETLINK			# netlink(4) support
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index ff2acef22a4d..6480ca6530e4 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -13,7 +13,6 @@ options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	CC_CUBIC		# include CUBIC congestion control
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options 	NETLINK			# netlink(4) support
 options 	ROUTE_MPATH		# Multipath routing support
 options 	FIB_ALGO		# Modular fib lookups
 options 	TCP_OFFLOAD		# TCP offload
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 820ff0ff30f0..f4956183b85c 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -29,3 +29,5 @@ options 	CC_CUBIC		# include CUBIC congestion control
 device		atpic
 
 options 	NEW_PCIB
+
+options 	NETLINK			# netlink(4) support
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 8e688bd6581b..475b584f366b 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -32,7 +32,6 @@ options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options 	NETLINK			# netlink(4) support
 options 	ROUTE_MPATH		# Multipath routing support
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_OFFLOAD		# TCP offload
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 984283c5bf5f..b9ce3e41c123 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -16,3 +16,5 @@ options 	GEOM_PART_MBR
 options 	CC_CUBIC		# include CUBIC congestion control
 
 options         NEW_PCIB
+
+options 	NETLINK			# netlink(4) support
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 6c40b031bee6..c4277983b66a 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -42,7 +42,6 @@ options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options 	NETLINK			# netlink(4) support
 options 	ROUTE_MPATH		# Multipath routing support
 options 	TCP_OFFLOAD		# TCP offload
 options 	TCP_BLACKBOX		# Enhanced TCP event logging
diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS
index 363186d28904..dbf94f9e0335 100644
--- a/sys/riscv/conf/DEFAULTS
+++ b/sys/riscv/conf/DEFAULTS
@@ -18,3 +18,5 @@ options 	CC_CUBIC		# include CUBIC congestion control
 
 options 	NEW_PCIB
 options 	INTRNG
+
+options 	NETLINK			# netlink(4) support
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index df7d680ff3ff..49e3f07c0f96 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -31,7 +31,6 @@ options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options 	NETLINK			# netlink(4) support
 options 	ROUTE_MPATH		# Multipath routing support
 options 	TCP_OFFLOAD		# TCP offload
 options 	TCP_BLACKBOX		# Enhanced TCP event logging