Module Name: src
Committed By: christos
Date: Sun Mar 8 02:19:04 UTC 2015
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
sync with OpenBSD
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.36 src/sys/dev/usb/if_urtwn.c:1.37
--- src/sys/dev/usb/if_urtwn.c:1.36 Sun Jan 11 09:19:09 2015
+++ src/sys/dev/usb/if_urtwn.c Sat Mar 7 21:19:04 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: if_urtwn.c,v 1.36 2015/01/11 14:19:09 jmcneill Exp $ */
-/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.37 2015/03/08 02:19:04 christos Exp $ */
+/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <[email protected]>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.36 2015/01/11 14:19:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.37 2015/03/08 02:19:04 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -109,29 +109,43 @@ static const struct urtwn_dev {
URTWN_DEV(ABOCOM, RTL8188CU_2),
URTWN_DEV(ABOCOM, RTL8192CU),
URTWN_DEV(ASUSTEK, RTL8192CU),
+ URTWN_DEV(ASUSTEK, RTL8192CU_3),
URTWN_DEV(ASUSTEK, USBN10NANO),
+ URTWN_DEV(ASUSTEK, RTL8192CU_3),
URTWN_DEV(AZUREWAVE, RTL8188CE_1),
URTWN_DEV(AZUREWAVE, RTL8188CE_2),
URTWN_DEV(AZUREWAVE, RTL8188CU),
+ URTWN_DEV(BELKIN, F7D2102),
URTWN_DEV(BELKIN, RTL8188CU),
+ URTWN_DEV(BELKIN, RTL8188CUS),
URTWN_DEV(BELKIN, RTL8192CU),
+ URTWN_DEV(BELKIN, RTL8192CU_1),
+ URTWN_DEV(BELKIN, RTL8192CU_2),
URTWN_DEV(CHICONY, RTL8188CUS_1),
URTWN_DEV(CHICONY, RTL8188CUS_2),
URTWN_DEV(CHICONY, RTL8188CUS_3),
URTWN_DEV(CHICONY, RTL8188CUS_4),
URTWN_DEV(CHICONY, RTL8188CUS_5),
+ URTWN_DEV(CHICONY, RTL8188CUS_6),
+ URTWN_DEV(COMPARE, RTL8192CU),
URTWN_DEV(COREGA, RTL8192CU),
+ URTWN_DEV(DLINK, DWA131B),
URTWN_DEV(DLINK, RTL8188CU),
URTWN_DEV(DLINK, RTL8192CU_1),
URTWN_DEV(DLINK, RTL8192CU_2),
URTWN_DEV(DLINK, RTL8192CU_3),
+ URTWN_DEV(DLINK, RTL8192CU_4),
URTWN_DEV(EDIMAX, RTL8188CU),
URTWN_DEV(EDIMAX, RTL8192CU),
URTWN_DEV(FEIXUN, RTL8188CU),
URTWN_DEV(FEIXUN, RTL8192CU),
URTWN_DEV(GUILLEMOT, HWNUP150),
+ URTWN_DEV(GUILLEMOT, RTL8192CU),
URTWN_DEV(HAWKING, RTL8192CU),
+ URTWN_DEV(HAWKING, RTL8192CU_2),
URTWN_DEV(HP3, RTL8188CU),
+ URTWN_DEV(IODATA, WNG150UM),
+ URTWN_DEV(IODATA, RTL8192CU),
URTWN_DEV(NETGEAR, WNA1000M),
URTWN_DEV(NETGEAR, RTL8192CU),
URTWN_DEV(NETGEAR4, RTL8188CU),
@@ -152,6 +166,7 @@ static const struct urtwn_dev {
URTWN_DEV(REALTEK, RTL8188CUS),
URTWN_DEV(REALTEK, RTL8188RU),
URTWN_DEV(REALTEK, RTL8188RU_2),
+ URTWN_DEV(REALTEK, RTL8188RU_3),
URTWN_DEV(REALTEK, RTL8191CU),
URTWN_DEV(REALTEK, RTL8192CE),
URTWN_DEV(REALTEK, RTL8192CU),
@@ -159,6 +174,7 @@ static const struct urtwn_dev {
URTWN_DEV(SITECOMEU, RTL8188CU_2),
URTWN_DEV(SITECOMEU, RTL8192CU),
URTWN_DEV(SITECOMEU, RTL8192CUR2),
+ URTWN_DEV(TPLINK, RTL8192CU),
URTWN_DEV(TRENDNET, RTL8188CU),
URTWN_DEV(TRENDNET, RTL8192CU),
URTWN_DEV(ZYXEL, RTL8192CU),
