[src/trunk]: src/sys/dev/usb for ethernet usb network devices, print the mac ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ffdbbe88c2dd
branches:  trunk
changeset: 1002553:ffdbbe88c2dd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 06 01:42:22 2019 +0000

description:
for ethernet usb network devices, print the mac addr in usbnet.

diffstat:

 sys/dev/usb/if_axe.c  |  10 ++--------
 sys/dev/usb/if_axen.c |   6 ++----
 sys/dev/usb/if_cdce.c |   6 ++----
 sys/dev/usb/if_ure.c  |   7 ++-----
 sys/dev/usb/usbnet.c  |   6 ++++--
 5 files changed, 12 insertions(+), 23 deletions(-)

diffs (140 lines):

diff -r 2bc2d1386648 -r ffdbbe88c2dd sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c      Tue Aug 06 01:34:29 2019 +0000
+++ b/sys/dev/usb/if_axe.c      Tue Aug 06 01:42:22 2019 +0000
@@ -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 @@
 
        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) {
diff -r 2bc2d1386648 -r ffdbbe88c2dd sys/dev/usb/if_axen.c
--- a/sys/dev/usb/if_axen.c     Tue Aug 06 01:34:29 2019 +0000
+++ b/sys/dev/usb/if_axen.c     Tue Aug 06 01:42:22 2019 +0000
@@ -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 @@
                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;
diff -r 2bc2d1386648 -r ffdbbe88c2dd sys/dev/usb/if_cdce.c
--- a/sys/dev/usb/if_cdce.c     Tue Aug 06 01:34:29 2019 +0000
+++ b/sys/dev/usb/if_cdce.c     Tue Aug 06 01:42:22 2019 +0000
@@ -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 <wpaul%windriver.com@localhost>
@@ -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 @@
                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);
diff -r 2bc2d1386648 -r ffdbbe88c2dd sys/dev/usb/if_ure.c
--- a/sys/dev/usb/if_ure.c      Tue Aug 06 01:34:29 2019 +0000
+++ b/sys/dev/usb/if_ure.c      Tue Aug 06 01:42:22 2019 +0000
@@ -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 @@
        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);
 
        /*
diff -r 2bc2d1386648 -r ffdbbe88c2dd sys/dev/usb/usbnet.c
--- a/sys/dev/usb/usbnet.c      Tue Aug 06 01:34:29 2019 +0000
+++ b/sys/dev/usb/usbnet.c      Tue Aug 06 01:42:22 2019 +0000
@@ -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 @@
         * 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);