svn commit: r287965 - head/sys/dev/iwm
Adrian Chadd
adrian at FreeBSD.org
Fri Sep 18 17:39:32 UTC 2015
Author: adrian
Date: Fri Sep 18 17:39:31 2015
New Revision: 287965
URL: https://svnweb.freebsd.org/changeset/base/287965
Log:
Ensure the ring state is also blanked upon reset, otherwise
duplicate rx events get handled during reset paths.
Submitted by: Matthew Dillion <dillon at apollo.backplane.com>
Obtained from: DragonflyBSD
Modified:
head/sys/dev/iwm/if_iwm.c
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Fri Sep 18 17:32:22 2015 (r287964)
+++ head/sys/dev/iwm/if_iwm.c Fri Sep 18 17:39:31 2015 (r287965)
@@ -884,7 +884,9 @@ iwm_reset_rx_ring(struct iwm_softc *sc,
(void) iwm_pcie_rx_stop(sc);
iwm_nic_unlock(sc);
}
+ /* Reset the ring state */
ring->cur = 0;
+ memset(sc->rxq.stat, 0, sizeof(*sc->rxq.stat));
}
static void
More information about the svn-src-head
mailing list