git: a052a188766f - releng/13.2 - Revert "netlink: add NETLINK to GENERIC."

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexander V. Chernikov <melifaro_at_FreeBSD.org>
Date: Mon, 27 Feb 2023 16:33:46 UTC
The branch releng/13.2 has been updated by melifaro:

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

commit a052a188766f022d4b0cb2484bda636a3345f644
Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2023-02-27 15:43:41 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-02-27 16:33:29 +0000

    Revert "netlink: add NETLINK to GENERIC."
    
    This is a Direct commit to releng/13.2.
    
    Requested by:   re (cperciva)
    Approved by:    re (cperciva)
    
    This reverts commit 6058f6cc48f5ec02476bf46693673bd71291a5c0.
    This reverts commit 692e19cf519578176d51d4c1001b01b1f355c1de.
---
 sys/amd64/conf/GENERIC     | 1 -
 sys/arm/conf/std.armv7     | 1 -
 sys/arm64/conf/GENERIC     | 1 -
 sys/i386/conf/GENERIC      | 1 -
 sys/powerpc/conf/GENERIC64 | 1 -
 sys/riscv/conf/GENERIC     | 1 -
 6 files changed, 6 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 41d1e57b7dca..9a02a7127955 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.armv7 b/sys/arm/conf/std.armv7
index 7cc4adb5bef2..dbe863d9da92 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -11,7 +11,6 @@ options 	INET6			# IPv6 communications protocols
 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/GENERIC b/sys/arm64/conf/GENERIC
index 9f7a67e2079a..f8842d672c0e 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/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/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 921b099ecf17..0bac5ba4c846 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/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 73d6ce5d4576..1e7fd9759874 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/GENERIC b/sys/riscv/conf/GENERIC
index 9c97e40f1db2..7d158269cde0 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