summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmatthew <jmatthew@openbsd.org>2019-06-07 04:03:04 +0000
committerjmatthew <jmatthew@openbsd.org>2019-06-07 04:03:04 +0000
commit6fe6f1f592536be4779b4dbdbaafeab76c06fa2f (patch)
tree9d1531c2b1740413067680354acf17ab83d3d7f2
parentCheck for user@host when parsing sftp target. This allows user@[1.2.3.4] (diff)
downloadwireguard-openbsd-6fe6f1f592536be4779b4dbdbaafeab76c06fa2f.tar.xz
wireguard-openbsd-6fe6f1f592536be4779b4dbdbaafeab76c06fa2f.zip
enable mcx(4) on arm64, found in Packet's g2.large.arm servers.
tested by and ok patrick@
-rw-r--r--sys/arch/arm64/conf/GENERIC3
-rw-r--r--sys/arch/arm64/conf/RAMDISK3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index cfd0655e667..057bb39eaff 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.103 2019/05/11 14:43:27 patrick Exp $
+# $OpenBSD: GENERIC,v 1.104 2019/06/07 04:03:04 jmatthew Exp $
#
# GENERIC machine description file
#
@@ -189,6 +189,7 @@ pci* at ppb?
bnxt* at pci? # Broadcom BCM573xx, BCM574xx
em* at pci? # Intel Pro/1000 Ethernet
ix* at pci? # Intel 82598EB 10Gb Ethernet
+mcx* at pci? # Mellanox ConnectX-4/5 Ethernet
mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
re* at pci? # Realtek 8169/8169S/8110S
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index f724b113288..7f102ef5c06 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.87 2019/05/11 14:43:27 patrick Exp $
+# $OpenBSD: RAMDISK,v 1.88 2019/06/07 04:03:04 jmatthew Exp $
#
# GENERIC machine description file
#
@@ -182,6 +182,7 @@ pci* at ppb?
bnxt* at pci? # Broadcom BCM573xx, BCM574xx
em* at pci? # Intel Pro/1000 Ethernet
ix* at pci? # Intel 82598EB 10Gb Ethernet
+mcx* at pci? # Mellanox ConnectX-4/5 Ethernet
mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
re* at pci? # Realtek 8169/8169S/8110S