Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Call bnx_print_adapter_info() before mii_attach(...



details:   https://anonhg.NetBSD.org/src/rev/426a8a617f92
branches:  trunk
changeset: 330461:426a8a617f92
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jul 09 16:30:11 2014 +0000

description:
Call bnx_print_adapter_info() before mii_attach() to not to
split bnx's dmesg into two parts by brgphy's dmesg.

diffstat:

 sys/dev/pci/if_bnx.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 0d197e707291 -r 426a8a617f92 sys/dev/pci/if_bnx.c
--- a/sys/dev/pci/if_bnx.c      Wed Jul 09 16:06:47 2014 +0000
+++ b/sys/dev/pci/if_bnx.c      Wed Jul 09 16:30:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bnx.c,v 1.56 2014/07/01 17:11:35 msaitoh Exp $      */
+/*     $NetBSD: if_bnx.c,v 1.57 2014/07/09 16:30:11 msaitoh Exp $      */
 /*     $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
 
 /*-
@@ -35,7 +35,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.56 2014/07/01 17:11:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.57 2014/07/09 16:30:11 msaitoh Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -828,6 +828,9 @@
        prop_dictionary_set_uint32(dict, "shared_hwcfg",sc->bnx_shared_hw_cfg);
        prop_dictionary_set_uint32(dict, "port_hwcfg", sc->bnx_port_hw_cfg);
 
+       /* Print some useful adapter info */
+       bnx_print_adapter_info(sc);
+
        if (sc->bnx_phy_flags & BNX_PHY_SERDES_FLAG)
                mii_flags |= MIIF_HAVEFIBER;
        mii_attach(self, &sc->bnx_mii, 0xffffffff,
@@ -852,8 +855,6 @@
        else
                aprint_error_dev(self, "couldn't establish power handler\n");
 
-       /* Finally, print some useful adapter info */
-       bnx_print_adapter_info(sc);
        /* Print some important debugging info. */
        DBRUN(BNX_INFO, bnx_dump_driver_state(sc));
 



Home | Main Index | Thread Index | Old Index