aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorAlexander V. Chernikov <melifaro@FreeBSD.org>2023-04-02 11:50:04 +0000
committerAlexander V. Chernikov <melifaro@FreeBSD.org>2023-04-02 15:27:21 +0000
commit3091d980f581753f86df4155057b4ef23eb3ad27 (patch)
treea5e7bc57d8135e18f0ba5eb7bff59055afb4be79 /sys/i386
parent4fd9e206716d019f46300aad40e5aa750ebb2e9d (diff)
downloadsrc-3091d980f581753f86df4155057b4ef23eb3ad27.tar.gz
src-3091d980f581753f86df4155057b4ef23eb3ad27.zip
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
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/DEFAULTS2
-rw-r--r--sys/i386/conf/GENERIC1
2 files changed, 2 insertions, 1 deletions
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