Module Name: src
Committed By: snj
Date: Sun Sep 18 06:00:20 UTC 2016
Modified Files:
src/sys/dev/usb [netbsd-7]: if_axe.c usbdevs
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1245):
sys/dev/usb/if_axe.c: revision 1.73, 1.74
sys/dev/usb/usbdevs: revision 1.716
Add flxd's axe(4)
--
flxd's axe(4) - I think.
--
Fix harmless typo
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.680.2.4 -r1.680.2.5 src/sys/dev/usb/usbdevs
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_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67 src/sys/dev/usb/if_axe.c:1.67.2.1
--- src/sys/dev/usb/if_axe.c:1.67 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_axe.c Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -155,6 +155,7 @@ static const struct axe_type axe_devs[]
{ { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0},
{ { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100}, 0 },
{ { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1 }, AX772 },
+ { { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DUBE100B1 }, AX772 },
{ { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100C1 }, AX772 | AX772B },
{ { USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_GWUSB2E}, 0 },
{ { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_ETGUS2 }, AX178 },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.4 src/sys/dev/usb/usbdevs:1.680.2.5
--- src/sys/dev/usb/usbdevs:1.680.2.4 Sun Oct 18 09:01:58 2015
+++ src/sys/dev/usb/usbdevs Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp $
+$NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1357,6 +1357,7 @@ product DLINK2 DWA130D1 0x3a0f DWA-130
product DLINK2 AR9271 0x3a10 AR9271
product DLINK2 DWLG122C1 0x3c03 DWL-G122 rev C1
product DLINK2 WUA1340 0x3c04 WUA-1340
+product DLINK2 DUBE100B1 0x3c05 DUB-E100 rev B1
product DLINK2 DWA111 0x3c06 DWA-111
product DLINK2 DWA110 0x3c07 DWA-110
product DLINK2 RT2870_1 0x3c09 RT2870
