Source-Changes-HG archive

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

[src/netbsd-7]: src/sys/dev/ic Pull up following revision(s) (requested by ma...



details:   https://anonhg.NetBSD.org/src/rev/e36abe3ac195
branches:  netbsd-7
changeset: 798793:e36abe3ac195
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jan 07 21:12:04 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #383):
        sys/dev/ic/dwc_gmac.c: revision 1.30
Fix index vs. count confusion when syncing a range of newly queued TX
descriptors. Pointed out by FUKAUMI Naoki in private chat.

diffstat:

 sys/dev/ic/dwc_gmac.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 5fc7ac1912b4 -r e36abe3ac195 sys/dev/ic/dwc_gmac.c
--- a/sys/dev/ic/dwc_gmac.c     Wed Jan 07 21:08:06 2015 +0000
+++ b/sys/dev/ic/dwc_gmac.c     Wed Jan 07 21:12:04 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.24.2.5 2015/01/07 21:12:04 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.24.2.5 2015/01/07 21:12:04 msaitoh Exp $");
 
 /* #define     DWC_GMAC_DEBUG  1 */
 
@@ -772,6 +772,7 @@
 {
        struct dwc_gmac_softc *sc = ifp->if_softc;
        int old = sc->sc_txq.t_queued;
+       int start = sc->sc_txq.t_cur;
        struct mbuf *m0;
 
        if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -791,7 +792,7 @@
 
        if (sc->sc_txq.t_queued != old) {
                /* packets have been queued, kick it off */
-               dwc_gmac_txdesc_sync(sc, old, sc->sc_txq.t_cur,
+               dwc_gmac_txdesc_sync(sc, start, sc->sc_txq.t_cur,
                    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 
                bus_space_write_4(sc->sc_bst, sc->sc_bsh,



Home | Main Index | Thread Index | Old Index