Module Name: src
Committed By: msaitoh
Date: Thu Feb 7 06:14:34 UTC 2019
Modified Files:
src/share/man/man4 [netbsd-8]: axen.4
src/sys/dev/usb [netbsd-8]: if_axen.c
Log Message:
Pullup the following revisions (requested by martin in ticket #1182):
sys/dev/usb/if_axen.c 1.14
share/man/man4/axen.4 1.7
Andrius V in Pr kern/53461: add D-Link DUB-1312
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/share/man/man4/axen.4
cvs rdiff -u -r1.11.8.2 -r1.11.8.3 src/sys/dev/usb/if_axen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/axen.4
diff -u src/share/man/man4/axen.4:1.6 src/share/man/man4/axen.4:1.6.4.1
--- src/share/man/man4/axen.4:1.6 Thu Apr 13 07:22:50 2017
+++ src/share/man/man4/axen.4 Thu Feb 7 06:14:34 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: axen.4,v 1.6 2017/04/13 07:22:50 skrll Exp $
+.\" $NetBSD: axen.4,v 1.6.4.1 2019/02/07 06:14:34 msaitoh Exp $
.\" $OpenBSD: axen.4,v 1.2 2013/10/07 07:18:36 jmc Exp $
.\"
.\" Copyright (c) 2013 Yojiro UO <[email protected]>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd April 13, 2017
+.Dd July 27, 2018
.Dt AXEN 4
.Os
.Sh NAME
@@ -33,6 +33,7 @@ including the following:
.Pp
.Bl -tag -width Ds -offset indent -compact
.It Buffalo LUA4-U3-AGT
+.It D-Link DUB-1312
.It Kurotoshiko GbE-USB3.0
.It Kurotoshiko GbE-USB3.0S2
.It Logitec LAN-GTJU3
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.11.8.2 src/sys/dev/usb/if_axen.c:1.11.8.3
--- src/sys/dev/usb/if_axen.c:1.11.8.2 Wed Aug 8 10:28:35 2018
+++ src/sys/dev/usb/if_axen.c Thu Feb 7 06:14:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.11.8.2 2018/08/08 10:28:35 martin Exp $ */
+/* $NetBSD: if_axen.c,v 1.11.8.3 2019/02/07 06:14:34 msaitoh Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.11.8.2 2018/08/08 10:28:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.11.8.3 2019/02/07 06:14:34 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -79,7 +79,8 @@ static const struct axen_type axen_devs[
#if 0 /* not tested */
{ { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178A}, AX178A },
#endif
- { { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88179}, AX179 }
+ { { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88179}, AX179 },
+ { { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUB1312}, AX179 }
};
#define axen_lookup(v, p) ((const struct axen_type *)usb_lookup(axen_devs, v, p))
