Add support for Ralink RT5360. From Kevin Lo who tested with a

D-Link DWA-525 rev A2.

diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 4cd1ca9..cd31f33 100644 (file)
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.110 2016/08/17 11:52:29 stsp Exp $
+.\" $OpenBSD: ral.4,v 1.111 2017/05/31 03:45:15 jsg Exp $
 .\"
 .\" Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 17 2016 $
+.Dd $Mdocdate: May 31 2017 $
 .Dt RAL 4
 .Os
 .Sh NAME
@@ -160,6 +160,7 @@ CNet CWP-854.
 Compex WLP54G.
 Conceptronic C54Ri.
 Corega CG-WLPCI54GL.
+D-Link DWA-525 rev A2.
 Digitus DN-7006G-RA.
 Dynalink WLG25PCI.
 E-Tech WGPI02.

diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 96a7f76..28b4512 100644 (file)
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rt2860.c,v 1.92 2017/01/22 10:17:38 dlg Exp $ */
+/*     $OpenBSD: rt2860.c,v 1.93 2017/05/31 03:45:15 jsg Exp $ */
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -3106,6 +3106,7 @@ rt2860_get_rf(uint16_t rev)
        case RT3070_RF_3052:    return "RT3052";
        case RT3070_RF_3320:    return "RT3320";
        case RT3070_RF_3053:    return "RT3053";
+       case RT5390_RF_5360:    return "RT5360";
        case RT5390_RF_5390:    return "RT5390";
        case RT5390_RF_5392:    return "RT5392";
        default:                return "unknown";

diff --git a/sys/dev/ic/rt2860reg.h b/sys/dev/ic/rt2860reg.h
index d5f44a7..bcd15f7 100644 (file)
--- a/sys/dev/ic/rt2860reg.h
+++ b/sys/dev/ic/rt2860reg.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rt2860reg.h,v 1.33 2016/08/17 11:50:52 stsp Exp $     */
+/*     $OpenBSD: rt2860reg.h,v 1.34 2017/05/31 03:45:15 jsg Exp $      */
 
 /*-
  * Copyright (c) 2007
@@ -925,6 +925,7 @@ struct rt2860_rxwi {
 #define RT3070_RF_3320 0x000b  /* 1T1R */
 #define RT3070_RF_3053 0x000d  /* dual-band 3T3R */
 #define RT5592_RF_5592 0x000f  /* dual-band 2T2R */
+#define RT5390_RF_5360 0x5360  /* 1T1R */
 #define RT5390_RF_5370 0x5370  /* 1T1R */
 #define RT5390_RF_5372 0x5372  /* 2T2R */
 #define RT5390_RF_5390 0x5390  /* 1T1R */

diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c
index c306a92..d2e7084 100644 (file)
--- a/sys/dev/pci/if_ral_pci.c
+++ b/sys/dev/pci/if_ral_pci.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_ral_pci.c,v 1.25 2016/08/17 11:50:52 stsp Exp $  */
+/*     $OpenBSD: if_ral_pci.c,v 1.26 2017/05/31 03:45:15 jsg Exp $  */
 
 /*-
  * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -136,6 +136,7 @@ const struct pci_matchid ral_pci_devices[] = {
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3562 },
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3592 },
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3593 },
+       { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5360 },
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390 },
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5392 },
        { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_1 },