Revert unrelated changes in previous.

diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c
index 66fa92f..ba01434 100644 (file)
--- a/sys/dev/i2c/i2c_scan.c
+++ b/sys/dev/i2c/i2c_scan.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: i2c_scan.c,v 1.144 2015/05/29 00:33:37 uebayasi Exp $ */
+/*     $OpenBSD: i2c_scan.c,v 1.145 2015/05/29 00:37:10 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
@@ -1059,7 +1059,6 @@ iic_scan(struct device *self, struct i2cbus_attach_args *iba)
        bzero(ignore_addrs, sizeof(ignore_addrs));
 
        for (i = 0; probes[i].probe; i++) {
-#if 0
 #if NIPMI > 0
                extern int ipmi_enabled;
 
@@ -1068,7 +1067,6 @@ iic_scan(struct device *self, struct i2cbus_attach_args *iba)
                            self->dv_xname);
                        continue;
                }
-#endif
 #endif
                pl = probes[i].pl;
                for (j = 0; pl[j].start && pl[j].end; j++) {

diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 68c6755..815cc0f 100644 (file)
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vic.c,v 1.89 2015/05/29 00:33:37 uebayasi Exp $    */
+/*     $OpenBSD: if_vic.c,v 1.90 2015/05/29 00:37:10 uebayasi Exp $    */
 
 /*
  * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -1341,16 +1341,6 @@ void
 vic_tick(void *arg)
 {
        struct vic_softc                *sc = (struct vic_softc *)arg;
-       int                             s, q;
-
-       /*
-        * XXX Poll Rx interrupt and process existing packets to work-around
-        * XXX occasional Rx interrupt lossage.
-        */
-       s = splnet();
-       for (q = 0; q < VIC_NRXRINGS; q++)
-               vic_rx_proc(sc, q);
-       splx(s);
 
        vic_link_state(sc);
 

diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index a617f6e..29738d5 100644 (file)
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vmx.c,v 1.27 2015/05/29 00:33:37 uebayasi Exp $    */
+/*     $OpenBSD: if_vmx.c,v 1.28 2015/05/29 00:37:10 uebayasi Exp $    */
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -151,7 +151,6 @@ int vmxnet3_alloc_rxring(struct vmxnet3_softc *, int);
 void vmxnet3_txinit(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
 void vmxnet3_rxinit(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
 void vmxnet3_txstop(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
-void vmxnet3_rxdump(struct vmxnet3_softc *);
 void vmxnet3_rxstop(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
 void vmxnet3_link_state(struct vmxnet3_softc *);
 void vmxnet3_enable_all_intrs(struct vmxnet3_softc *);
@@ -517,28 +516,6 @@ vmxnet3_txstop(struct vmxnet3_softc *sc, struct vmxnet3_txqueue *tq)
        }
 }
 
-void
-vmxnet3_rxdump(struct vmxnet3_softc *sc)
-{
-#if 0
-       int queue, i;
-
-       for (queue = 0; queue < NRXQUEUE; queue++) {
-               struct vmxnet3_rxqueue *rq = &sc->sc_rxq[queue];
-
-               for (i = 0; i < 2; i++) {
-                       struct vmxnet3_rxring *ring = &rq->cmd_ring[i];
-
-                       struct if_rxring *r = &ring->rxr;
-                       printf("ring%d: "
-                           "adjusted=%d alive=%u cwm=%u lwm=%u hwm=%u\n",
-                           i,
-                           r->rxr_adjusted, r->rxr_alive, r->rxr_cwm, r->rxr_lwm, r->rxr_hwm);
-               }
-       }
-#endif
-}
-
 void
 vmxnet3_rxstop(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rq)
 {
@@ -936,7 +913,6 @@ vmxnet3_stop(struct ifnet *ifp)
                vmxnet3_txstop(sc, &sc->sc_txq[queue]);
        for (queue = 0; queue < NRXQUEUE; queue++)
                vmxnet3_rxstop(sc, &sc->sc_rxq[queue]);
-       vmxnet3_rxdump(sc);
 }
 
 void
@@ -965,7 +941,6 @@ vmxnet3_init(struct vmxnet3_softc *sc)
                vmxnet3_txinit(sc, &sc->sc_txq[queue]);
        for (queue = 0; queue < NRXQUEUE; queue++)
                vmxnet3_rxinit(sc, &sc->sc_rxq[queue]);
-       vmxnet3_rxdump(sc);
 
        WRITE_CMD(sc, VMXNET3_CMD_ENABLE);
        if (READ_BAR1(sc, VMXNET3_BAR1_CMD)) {