The branch main has been updated by kib:

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

commit 5832a3e398642f721381dc2bdc8e954ae43c17a7
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-02-03 12:19:12 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-02-05 01:22:26 +0000

    amd64 GENERIC: compile in mlx5en(4)
    
    Reviewed by:    hselasky, manu
    Sponsored by:   NVidia Networking/Mellanox Technologies
    MFC after:      3 days
    Differential Revision:  https://reviews.freebsd.org/D28469
---
 sys/amd64/conf/GENERIC | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 387128f7cba8..cdee2a91554b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -134,6 +134,8 @@ device              pci
 options        PCI_HP                  # PCI-Express native HotPlug
 options                PCI_IOV                 # PCI SR-IOV support
 
+options        COMPAT_LINUXKPI
+
 # Floppy drives
 device         fdc
 
@@ -258,6 +260,12 @@ device             bxe                     # Broadcom 
NetXtreme II BCM5771X/BCM578XX 10GbE
 device         le                      # AMD Am7900 LANCE and Am79C9xx PCnet
 device         ti                      # Alteon Networks Tigon I/II gigabit 
Ethernet
 
+# 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
@@ -326,6 +334,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!
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to