summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-03-30 09:51:18 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-01 09:15:29 +0200
commitdd1feda161ce70881cb9c1f90f4ef694d7f41a9f (patch)
tree45e0cbc03a84179950795bf9e719f9538a429424
parentif_dwc: Avoid NULL pointer access (diff)
downloadrtems-libbsd-dd1feda161ce70881cb9c1f90f4ef694d7f41a9f.tar.bz2
if_dwc: Fix transmit starvation
-rw-r--r--freebsd/sys/dev/dwc/if_dwc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/freebsd/sys/dev/dwc/if_dwc.c b/freebsd/sys/dev/dwc/if_dwc.c
index 33240ead..863816d2 100644
--- a/freebsd/sys/dev/dwc/if_dwc.c
+++ b/freebsd/sys/dev/dwc/if_dwc.c
@@ -321,10 +321,6 @@ dwc_txstart_locked(struct dwc_softc *sc)
ifp = sc->ifp;
- if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
- return;
- }
-
enqueued = 0;
for (;;) {
@@ -357,7 +353,8 @@ dwc_txstart(struct ifnet *ifp)
struct dwc_softc *sc = ifp->if_softc;
DWC_LOCK(sc);
- dwc_txstart_locked(sc);
+ if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0)
+ dwc_txstart_locked(sc);
DWC_UNLOCK(sc);
}
@@ -824,6 +821,9 @@ dwc_txfinish_locked(struct dwc_softc *sc)
sc->tx_idx_tail = next_txidx(sc, sc->tx_idx_tail);
}
+ sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+ dwc_txstart_locked(sc);
+
/* If there are no buffers outstanding, muzzle the watchdog. */
if (sc->tx_idx_tail == sc->tx_idx_head) {
sc->tx_watchdog_count = 0;