Author: mjg
Date: Thu Apr 12 04:11:37 2018
New Revision: 332422
URL: https://svnweb.freebsd.org/changeset/base/332422
Log:
iflib: fix up a mismerge in r332419
Lead to crashes on boot while in ifconfig.
Submitted by: Matthew Macy <mm...@mattmacy.io>
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c Thu Apr 12 02:10:01 2018 (r332421)
+++ head/sys/net/iflib.c Thu Apr 12 04:11:37 2018 (r332422)
@@ -2288,7 +2288,7 @@ iflib_stop(if_ctx_t ctx)
for (i = 0; i < scctx->isc_nrxqsets; i++, rxq++) {
/* make sure all transmitters have completed before proceeding
XXX */
- for (j = 0, di = txq->ift_ifdi; j < rxq->ifr_nfl; j++, di++)
+ for (j = 0, di = rxq->ifr_ifdi; j < rxq->ifr_nfl; j++, di++)
bzero((void *)di->idi_vaddr, di->idi_size);
/* also resets the free lists pidx/cidx */
for (j = 0, fl = rxq->ifr_fl; j < rxq->ifr_nfl; j++, fl++)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
