From 2104199dc305ca7290a499b36a0277c36432f2f5 Mon Sep 17 00:00:00 2001 From: fair Date: Mon, 21 Oct 2002 23:38:10 +0000 Subject: [PATCH] Change the "dontcare bits" argument to ifmedia_init() to IFM_IMASK so that it is possible select PHY instances other than the first one (instance zero), if there is more than one PHY attached. --- sys/dev/pci/if_pcn.c | 6 +++--- sys/dev/pci/if_ste.c | 6 +++--- sys/dev/pci/if_stge.c | 6 +++--- sys/dev/pci/if_vr.c | 7 ++++--- sys/dev/pci/if_wm.c | 6 +++--- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 85d5be61c9dd..76066024f916 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_pcn.c,v 1.14 2002/10/02 16:51:27 thorpej Exp $ */ +/* $NetBSD: if_pcn.c,v 1.15 2002/10/21 23:38:10 fair Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.14 2002/10/02 16:51:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.15 2002/10/21 23:38:10 fair Exp $"); #include "bpfilter.h" @@ -1949,7 +1949,7 @@ pcn_79c970_mediainit(struct pcn_softc *sc) { const char *sep = ""; - ifmedia_init(&sc->sc_mii.mii_media, 0, pcn_79c970_mediachange, + ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, pcn_79c970_mediachange, pcn_79c970_mediastatus); #define ADD(s, m, d) \ diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 78a202d88d37..ebf7890b1550 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ste.c,v 1.14 2002/10/02 16:51:30 thorpej Exp $ */ +/* $NetBSD: if_ste.c,v 1.15 2002/10/21 23:38:11 fair Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.14 2002/10/02 16:51:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.15 2002/10/21 23:38:11 fair Exp $"); #include "bpfilter.h" @@ -484,7 +484,7 @@ ste_attach(struct device *parent, struct device *self, void *aux) sc->sc_mii.mii_readreg = ste_mii_readreg; sc->sc_mii.mii_writereg = ste_mii_writereg; sc->sc_mii.mii_statchg = ste_mii_statchg; - ifmedia_init(&sc->sc_mii.mii_media, 0, ste_mediachange, + ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ste_mediachange, ste_mediastatus); mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index 270af8f2b2bc..01fb0669fd24 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.12 2002/10/02 16:51:31 thorpej Exp $ */ +/* $NetBSD: if_stge.c,v 1.13 2002/10/21 23:38:11 fair Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.12 2002/10/02 16:51:31 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.13 2002/10/21 23:38:11 fair Exp $"); #include "bpfilter.h" @@ -590,7 +590,7 @@ stge_attach(struct device *parent, struct device *self, void *aux) sc->sc_mii.mii_readreg = stge_mii_readreg; sc->sc_mii.mii_writereg = stge_mii_writereg; sc->sc_mii.mii_statchg = stge_mii_statchg; - ifmedia_init(&sc->sc_mii.mii_media, 0, stge_mediachange, + ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, stge_mediachange, stge_mediastatus); mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, MIIF_DOPAUSE); diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index d47c95dc10dd..82bd277cd90e 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.57 2002/10/02 16:51:35 thorpej Exp $ */ +/* $NetBSD: if_vr.c,v 1.58 2002/10/21 23:38:12 fair Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.57 2002/10/02 16:51:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.58 2002/10/21 23:38:12 fair Exp $"); #include #include @@ -1621,7 +1621,8 @@ vr_attach(parent, self, aux) sc->vr_mii.mii_readreg = vr_mii_readreg; sc->vr_mii.mii_writereg = vr_mii_writereg; sc->vr_mii.mii_statchg = vr_mii_statchg; - ifmedia_init(&sc->vr_mii.mii_media, 0, vr_ifmedia_upd, vr_ifmedia_sts); + ifmedia_init(&sc->vr_mii.mii_media, IFM_IMASK, vr_ifmedia_upd, + vr_ifmedia_sts); mii_attach(&sc->vr_dev, &sc->vr_mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); if (LIST_FIRST(&sc->vr_mii.mii_phys) == NULL) { diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index 73b69ee5ac1a..c0a63070c140 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.25 2002/10/02 16:51:37 thorpej Exp $ */ +/* $NetBSD: if_wm.c,v 1.26 2002/10/21 23:38:12 fair Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -2480,7 +2480,7 @@ wm_tbi_mediainit(struct wm_softc *sc) else sc->sc_tipg = TIPG_LG_DFLT; - ifmedia_init(&sc->sc_mii.mii_media, 0, wm_tbi_mediachange, + ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, wm_tbi_mediachange, wm_tbi_mediastatus); /* @@ -2741,7 +2741,7 @@ wm_gmii_mediainit(struct wm_softc *sc) wm_gmii_reset(sc); - ifmedia_init(&sc->sc_mii.mii_media, 0, wm_gmii_mediachange, + ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, wm_gmii_mediachange, wm_gmii_mediastatus); mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,