git: 0dc48b74478d - stable/12 - amd64 GENERIC: compile in mlx5en(4)

[Konstantin Belousov]

The branch stable/12 has been updated by kib:

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

commit 0dc48b74478d4298cf612e1ce3c196f711533abf
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-02-03 12:19:12 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-02-09 08:36:31 +0000

    amd64 GENERIC: compile in mlx5en(4)
    
    (cherry picked from commit 5832a3e398642f721381dc2bdc8e954ae43c17a7)
---
 sys/amd64/conf/GENERIC | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 371e931c7a1d..1bd3c3762f53 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -109,6 +109,8 @@ device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
 options		PCI_IOV			# PCI SR-IOV support
 
+options 	COMPAT_LINUXKPI
+
 # Floppy drives
 device		fdc
 
@@ -236,6 +238,12 @@ device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp			# 3Com 3cR990 (``Typhoon'')
 device		vx			# 3Com 3c590, 3c595 (``Vortex'')
 
+# Nvidia/Mellanox Connect-X 4 and later, Ethernet only
+# mlx5ib requires ibcore infra and is not included by default
+device		mlx5			# Base driver
+device		mlxfw			# Firmware update
+device		mlx5en			# Ethernet driver
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus			# MII bus support
@@ -313,6 +321,7 @@ device		tuntap			# Packet tunnel.
 device		md			# Memory "disks"
 device		gif			# IPv6 and IPv4 tunneling
 device		firmware		# firmware assist module
+device		xz			# lzma decompression
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!