Module Name: src
Committed By: mrg
Date: Tue Aug 6 01:42:22 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c if_axen.c if_cdce.c if_ure.c usbnet.c
Log Message:
for ethernet usb network devices, print the mac addr in usbnet.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/if_ure.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/usbnet.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_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.105 src/sys/dev/usb/if_axe.c:1.106
--- src/sys/dev/usb/if_axe.c:1.105 Tue Aug 6 00:19:57 2019
+++ src/sys/dev/usb/if_axe.c Tue Aug 6 01:42:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.105 2019/08/06 00:19:57 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.106 2019/08/06 01:42:22 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.105 2019/08/06 00:19:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.106 2019/08/06 01:42:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -977,12 +977,6 @@ axe_attach(device_t parent, device_t sel
usbnet_unlock_mii(un);
- /*
- * An ASIX chip was detected. Inform the world.
- */
- aprint_normal_dev(self, "Ethernet address %s\n",
- ether_sprintf(un->un_eaddr));
-
if (AXE_IS_178_FAMILY(sc))
usbnet_ec(un)->ec_capabilities = ETHERCAP_VLAN_MTU;
if (sc->axe_flags & AX772B) {
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.55 src/sys/dev/usb/if_axen.c:1.56
--- src/sys/dev/usb/if_axen.c:1.55 Tue Aug 6 00:19:57 2019
+++ src/sys/dev/usb/if_axen.c Tue Aug 6 01:42:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.55 2019/08/06 00:19:57 mrg Exp $ */
+/* $NetBSD: if_axen.c,v 1.56 2019/08/06 01:42:22 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.55 2019/08/06 00:19:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.56 2019/08/06 01:42:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -708,8 +708,6 @@ axen_attach(device_t parent, device_t se
aprint_normal_dev(self, "AX88179\n");
else
aprint_normal_dev(self, "(unknown)\n");
- aprint_normal_dev(self, "Ethernet address %s\n",
- ether_sprintf(un->un_eaddr));
struct ethercom *ec = usbnet_ec(un);
ec->ec_capabilities = ETHERCAP_VLAN_MTU;
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.57 src/sys/dev/usb/if_cdce.c:1.58
--- src/sys/dev/usb/if_cdce.c:1.57 Tue Aug 6 00:19:57 2019
+++ src/sys/dev/usb/if_cdce.c Tue Aug 6 01:42:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.57 2019/08/06 00:19:57 mrg Exp $ */
+/* $NetBSD: if_cdce.c,v 1.58 2019/08/06 01:42:22 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.57 2019/08/06 00:19:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.58 2019/08/06 01:42:22 mrg Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -250,8 +250,6 @@ cdce_attach(device_t parent, device_t se
un->un_eaddr[5] = (uint8_t)(device_unit(un->un_dev));
}
- aprint_normal_dev(self, "address %s\n", ether_sprintf(un->un_eaddr));
-
usbnet_attach(un, "cdcedet", CDCE_RX_LIST_CNT, CDCE_TX_LIST_CNT);
usbnet_attach_ifp(un, false, IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST,
0, 0);
Index: src/sys/dev/usb/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.17 src/sys/dev/usb/if_ure.c:1.18
--- src/sys/dev/usb/if_ure.c:1.17 Tue Aug 6 00:19:57 2019
+++ src/sys/dev/usb/if_ure.c Tue Aug 6 01:42:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.17 2019/08/06 00:19:57 mrg Exp $ */
+/* $NetBSD: if_ure.c,v 1.18 2019/08/06 01:42:22 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.17 2019/08/06 00:19:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.18 2019/08/06 01:42:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -939,9 +939,6 @@ ure_attach(device_t parent, device_t sel
usbnet_unlock(un);
memcpy(un->un_eaddr, eaddr, sizeof un->un_eaddr);
- aprint_normal_dev(self, "Ethernet address %s\n",
- ether_sprintf(un->un_eaddr));
-
struct ifnet *ifp = usbnet_ifp(un);
/*
Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.5 src/sys/dev/usb/usbnet.c:1.6
--- src/sys/dev/usb/usbnet.c:1.5 Tue Aug 6 00:19:57 2019
+++ src/sys/dev/usb/usbnet.c Tue Aug 6 01:42:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.5 2019/08/06 00:19:57 mrg Exp $ */
+/* $NetBSD: usbnet.c,v 1.6 2019/08/06 01:42:22 mrg Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.5 2019/08/06 00:19:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.6 2019/08/06 01:42:22 mrg Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1100,6 +1100,8 @@ usbnet_attach_ifp(struct usbnet *un,
* instead attach bpf here..
*/
if (!usbnet_empty_eaddr(un)) {
+ aprint_normal_dev(un->un_dev, "Ethernet address %s\n",
+ ether_sprintf(un->un_eaddr));
ether_ifattach(ifp, un->un_eaddr);
} else {
if_alloc_sadl(ifp);
