svn commit: r367117 - head/sys/net

Vincenzo Maffione vmaffione at FreeBSD.org
Wed Oct 28 21:06:18 UTC 2020


Author: vmaffione
Date: Wed Oct 28 21:06:17 2020
New Revision: 367117
URL: https://svnweb.freebsd.org/changeset/base/367117

Log:
  iflib: fix typo bug introduced by r367093
  
  Code was supposed to call callout_reset_sbt_on() rather than
  callout_reset_sbt(). This resulted into passing a "cpu" value
  to a "flag" argument. A recipe for subtle errors.
  
  PR:	248652
  Reported by:	sg at efficientip.com
  MFC with: r367093

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Wed Oct 28 21:02:43 2020	(r367116)
+++ head/sys/net/iflib.c	Wed Oct 28 21:06:17 2020	(r367117)
@@ -1066,9 +1066,10 @@ iflib_netmap_txsync(struct netmap_kring *kring, int fl
 
 	if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ))
 		if (kring->nr_hwtail != nm_prev(kring->nr_hwcur, lim)) {
-			callout_reset_sbt(&txq->ift_netmap_timer,
+			callout_reset_sbt_on(&txq->ift_netmap_timer,
 			    NETMAP_TX_TIMER_US * SBT_1US, SBT_1US,
-			    iflib_netmap_timer, txq, txq->ift_netmap_timer.c_cpu);
+			    iflib_netmap_timer, txq,
+			    txq->ift_netmap_timer.c_cpu, 0);
 		}
 	return (0);
 }


More information about the svn-src-head mailing list