summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-05-04 17:59:40 +0000
committerderaadt <deraadt@openbsd.org>2019-05-04 17:59:40 +0000
commitf156975bd516e96d2a38f89f2e07f0b9f701a7bd (patch)
treedd0ad292083d343bf1c314c3f6dd87efc143928a
parent3 bytes of kernel stack address space were leaked into on-disk directories. (diff)
downloadwireguard-openbsd-f156975bd516e96d2a38f89f2e07f0b9f701a7bd.tar.xz
wireguard-openbsd-f156975bd516e96d2a38f89f2e07f0b9f701a7bd.zip
let users try mcx(4)
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 0dde82cd342..a8e389c4fd1 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.469 2019/05/04 11:34:47 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.470 2019/05/04 17:59:40 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -522,6 +522,7 @@ lii* at pci? # Attansic L2 Ethernet
jme* at pci? # JMicron JMC250/JMC260 Ethernet
bnxt* at pci? # Broadcom BCM573xx, BCM574xx
ixl* at pci? # Intel Ethernet 700 Series
+mcx* at pci? # Mellanox ConnectX-4
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index aabaa961660..8f19cdf8f99 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.178 2019/03/14 19:25:43 kettenis Exp $
+# $OpenBSD: RAMDISK_CD,v 1.179 2019/05/04 17:59:40 deraadt Exp $
machine amd64
maxusers 4
@@ -245,6 +245,7 @@ jme* at pci? # JMicron JMC250/JMC260 Ethernet
bnxt* at pci? # Broadcom BCM573xx, BCM574xx
bwfm* at pci? # Broadcom FullMAC
ixl* at pci? # Intel Ethernet 700 Series
+mcx* at pci? # Mellanox ConnectX-4
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
acx* at cardbus? # TI ACX100/ACX111 (802.11b/g)