Module Name: src
Committed By: mrg
Date: Fri Aug 23 04:32:57 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c if_axen.c if_mue.c if_smsc.c if_udav.c
if_ure.c if_url.c usbnet.h
Log Message:
s/UBSNET_MII_DECL_DEFAULT/USBNET_MII_DECL_DEFAULT/. from sc.dying.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/usb/if_ure.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/usbnet.h
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.118 src/sys/dev/usb/if_axe.c:1.119
--- src/sys/dev/usb/if_axe.c:1.118 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_axe.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.118 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.118 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -863,7 +863,7 @@ void
axe_attach(device_t parent, device_t self, void *aux)
{
AXEHIST_FUNC(); AXEHIST_CALLED();
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct axe_softc *sc = device_private(self);
struct usbnet * const un = &sc->axe_un;
struct usb_attach_arg *uaa = aux;
@@ -1201,7 +1201,7 @@ axe_tx_prepare(struct usbnet *un, struct
memcpy(c->unc_buf, &hdr, hdr_len);
m_copydata(m, 0, m->m_pkthdr.len, c->unc_buf + hdr_len);
if (tlr_len)
- memcpy(c->unc_buf + length, &tlr, tlr_len);
+ memcpy(c->unc_buf + length - tlr_len, &tlr, tlr_len);
return length;
}
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.66 src/sys/dev/usb/if_axen.c:1.67
--- src/sys/dev/usb/if_axen.c:1.66 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_axen.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.66 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_axen.c,v 1.67 2019/08/23 04:32:57 mrg 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.66 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.67 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -599,7 +599,7 @@ axen_match(device_t parent, cfdata_t mat
static void
axen_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct usbnet * const un = device_private(self);
struct usb_attach_arg *uaa = aux;
struct usbd_device *dev = uaa->uaa_device;
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.54 src/sys/dev/usb/if_mue.c:1.55
--- src/sys/dev/usb/if_mue.c:1.54 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_mue.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.54 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_mue.c,v 1.55 2019/08/23 04:32:57 mrg Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.54 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.55 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -761,7 +761,7 @@ mue_match(device_t parent, cfdata_t matc
static void
mue_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct usbnet * const un = device_private(self);
prop_dictionary_t dict = device_properties(self);
struct usb_attach_arg *uaa = aux;
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.60 src/sys/dev/usb/if_smsc.c:1.61
--- src/sys/dev/usb/if_smsc.c:1.60 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_smsc.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.60 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_smsc.c,v 1.61 2019/08/23 04:32:57 mrg Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.60 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.61 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -809,7 +809,7 @@ smsc_match(device_t parent, cfdata_t mat
void
smsc_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct smsc_softc * const sc = device_private(self);
struct usbnet * const un = &sc->smsc_un;
struct usb_attach_arg *uaa = aux;
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.70 src/sys/dev/usb/if_udav.c:1.71
--- src/sys/dev/usb/if_udav.c:1.70 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_udav.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.70 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_udav.c,v 1.71 2019/08/23 04:32:57 mrg Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.70 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.71 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -156,7 +156,7 @@ udav_match(device_t parent, cfdata_t mat
void
udav_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct usbnet_mii *unmp;
struct usbnet * const un = device_private(self);
struct usb_attach_arg *uaa = aux;
Index: src/sys/dev/usb/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.30 src/sys/dev/usb/if_ure.c:1.31
--- src/sys/dev/usb/if_ure.c:1.30 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_ure.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.30 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_ure.c,v 1.31 2019/08/23 04:32:57 mrg Exp $ */
/* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
/*-
@@ -30,7 +30,7 @@
/* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.30 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.31 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -838,7 +838,7 @@ ure_match(device_t parent, cfdata_t matc
static void
ure_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct usbnet * const un = device_private(self);
struct usb_attach_arg *uaa = aux;
struct usbd_device *dev = uaa->uaa_device;
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.69 src/sys/dev/usb/if_url.c:1.70
--- src/sys/dev/usb/if_url.c:1.69 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/if_url.c Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.69 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: if_url.c,v 1.70 2019/08/23 04:32:57 mrg Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.69 2019/08/20 06:37:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.70 2019/08/23 04:32:57 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -157,7 +157,7 @@ url_match(device_t parent, cfdata_t matc
void
url_attach(device_t parent, device_t self, void *aux)
{
- UBSNET_MII_DECL_DEFAULT(unm);
+ USBNET_MII_DECL_DEFAULT(unm);
struct usbnet * const un = device_private(self);
struct usb_attach_arg *uaa = aux;
struct usbd_device *dev = uaa->uaa_device;
Index: src/sys/dev/usb/usbnet.h
diff -u src/sys/dev/usb/usbnet.h:1.13 src/sys/dev/usb/usbnet.h:1.14
--- src/sys/dev/usb/usbnet.h:1.13 Tue Aug 20 06:37:06 2019
+++ src/sys/dev/usb/usbnet.h Fri Aug 23 04:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.h,v 1.13 2019/08/20 06:37:06 mrg Exp $ */
+/* $NetBSD: usbnet.h,v 1.14 2019/08/23 04:32:57 mrg Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -186,7 +186,7 @@ struct usbnet_intr {
};
/*
- * Structure to setup MII. Use the UBSNET_MII_DECL_DEFAULT() macro for
+ * Structure to setup MII. Use the USBNET_MII_DECL_DEFAULT() macro for
* sane default. Pass a copy to usbnet_attach_ifp(). Not used
* after the usbnet_attach_ifp() function returns.
*/
@@ -204,7 +204,7 @@ struct usbnet_mii {
.un_mii_offset = off, \
.un_mii_flags = flags, \
}
-#define UBSNET_MII_DECL_DEFAULT(name) \
+#define USBNET_MII_DECL_DEFAULT(name) \
UBSNET_MII_DECL(name, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0)
/*
