Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci - Add missing splnet()/splx() around mii_tick()....



details:   https://anonhg.NetBSD.org/src/rev/308d821e9f64
branches:  trunk
changeset: 460362:308d821e9f64
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 18 23:06:57 2019 +0000

description:
- Add missing splnet()/splx() around mii_tick(). Same as OpenBSD rev. 1.23
- Use device_printf() instead of aprint_error_dev)() in bce_watchdog().
- Remove unneccesary inclusion.

diffstat:

 sys/dev/pci/if_bce.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 74ce0640495c -r 308d821e9f64 sys/dev/pci/if_bce.c
--- a/sys/dev/pci/if_bce.c      Fri Oct 18 20:42:10 2019 +0000
+++ b/sys/dev/pci/if_bce.c      Fri Oct 18 23:06:57 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.54 2019/10/18 04:09:02 msaitoh Exp $   */
+/* $NetBSD: if_bce.c,v 1.55 2019/10/18 23:06:57 msaitoh Exp $   */
 
 /*
  * Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.54 2019/10/18 04:09:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.55 2019/10/18 23:06:57 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -63,8 +63,6 @@
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
-#include <dev/mii/miidevs.h>
-#include <dev/mii/brgphyreg.h>
 
 #include <dev/pci/if_bcereg.h>
 
@@ -653,7 +651,7 @@
 {
        struct bce_softc *sc = ifp->if_softc;
 
-       aprint_error_dev(sc->bce_dev, "device timeout\n");
+       device_printf(sc->bce_dev, "device timeout\n");
        ifp->if_oerrors++;
 
        (void) bce_init(ifp);
@@ -1476,9 +1474,11 @@
 bce_tick(void *v)
 {
        struct bce_softc *sc = v;
+       int s;
 
-       /* Tick the MII. */
+       s = splnet();
        mii_tick(&sc->bce_mii);
+       splx(s);
 
        callout_reset(&sc->bce_timeout, hz, bce_tick, sc);
 }



Home | Main Index | Thread Index | Old Index