Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2015 17:39:32 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r287965 - head/sys/dev/iwm
Message-ID:  <201509181739.t8IHdWTs082736@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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@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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509181739.t8IHdWTs082736>