Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci Pull the following fix from OpenBSD:



details:   https://anonhg.NetBSD.org/src/rev/ba3a57a0688f
branches:  trunk
changeset: 761294:ba3a57a0688f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jan 23 03:15:06 2011 +0000

description:
Pull the following fix from OpenBSD:
http://www.openbsd.org/cgi-bin/cvsweb/src/sys/dev/pci/if_nfe.c#rev1.97
>> Some nfe(4)/rlphy(4) combos don't work, because the PHY responds to all
>> addresses on the mii bus.  As a countereasure, only attach the first PHY we
>> encounter.  It is very unlikely we're going to ever see nfe(4) with multiple
>> PHYs.  The same is probably true for any modern NIC.

Should suppress bogus ukphy30 noted in PR kern/42950.
No bad side effect on my nfe(4) which didn't get ghosts:
---
nfe0 at pci0 dev 5 function 0: NVIDIA nForce3 Ethernet #4 (rev. 0xa2)
 :
rlphy0 at nfe0 phy 1: RTL8201L 10/100 media interface, rev. 1
rlphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto

diffstat:

 sys/dev/pci/if_nfe.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r ca8a93b627f8 -r ba3a57a0688f sys/dev/pci/if_nfe.c
--- a/sys/dev/pci/if_nfe.c      Sun Jan 23 02:08:24 2011 +0000
+++ b/sys/dev/pci/if_nfe.c      Sun Jan 23 03:15:06 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_nfe.c,v 1.53 2010/11/03 14:03:40 jakllsch Exp $     */
+/*     $NetBSD: if_nfe.c,v 1.54 2011/01/23 03:15:06 tsutsui Exp $      */
 /*     $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $        */
 
 /*-
@@ -21,7 +21,7 @@
 /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.53 2010/11/03 14:03:40 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.54 2011/01/23 03:15:06 tsutsui Exp $");
 
 #include "opt_inet.h"
 #include "vlan.h"
@@ -396,8 +396,7 @@
        ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange,
            ether_mediastatus);
 
-       mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
-           MII_OFFSET_ANY, mii_flags);
+       mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, 0, mii_flags);
 
        if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
                aprint_error_dev(self, "no PHY found!\n");



Home | Main Index | Thread Index | Old Index