Module Name: src
Committed By: msaitoh
Date: Wed Aug 5 03:17:18 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Set if_baudrate for non-MII device. Before this commit, it was 0.
To generate a diff of this commit:
cvs rdiff -u -r1.684 -r1.685 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.684 src/sys/dev/pci/if_wm.c:1.685
--- src/sys/dev/pci/if_wm.c:1.684 Wed Aug 5 01:58:42 2020
+++ src/sys/dev/pci/if_wm.c Wed Aug 5 03:17:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.684 2020/08/05 01:58:42 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.685 2020/08/05 03:17:18 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.684 2020/08/05 01:58:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.685 2020/08/05 03:17:18 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -12019,6 +12019,7 @@ wm_tbi_mediainit(struct wm_softc *sc)
sc->sc_mii.mii_ifp = ifp;
sc->sc_ethercom.ec_mii = &sc->sc_mii;
+ ifp->if_baudrate = IF_Gbps(1);
if (((sc->sc_type >= WM_T_82575) && (sc->sc_type <= WM_T_I211))
&& (sc->sc_mediatype == WM_MEDIATYPE_SERDES)) {
ifmedia_init_with_lock(&sc->sc_mii.mii_media, IFM_IMASK,
@@ -12553,6 +12554,7 @@ wm_serdes_mediastatus(struct ifnet *ifp,
break;
}
}
+ ifp->if_baudrate = ifmedia_baudrate(ifmr->ifm_active);
if ((reg & PCS_LSTS_FDX) != 0)
ifmr->ifm_active |= IFM_FDX;
else
