svn commit: r315201 - head/sys/dev/cxgbe

Navdeep Parhar np at FreeBSD.org
Mon Mar 13 17:16:30 UTC 2017


Author: np
Date: Mon Mar 13 17:16:29 2017
New Revision: 315201
URL: https://svnweb.freebsd.org/changeset/base/315201

Log:
  cxgbe(4):  Fix an always-true assertion (reported by PVS-Studio).
  
  sys/dev/cxgbe/t4_main.c: PVS-Studio: Expression is Always True (CWE-571) (3)
  
  PR:		217746
  Submitted by:	Svyatoslav (razmyslov at viva64 com)
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Mon Mar 13 17:15:45 2017	(r315200)
+++ head/sys/dev/cxgbe/t4_main.c	Mon Mar 13 17:16:29 2017	(r315201)
@@ -7999,9 +7999,9 @@ sysctl_tp_timer(SYSCTL_HANDLER_ARGS)
 	u_int cclk_ps = 1000000000 / sc->params.vpd.cclk;
 
 	MPASS(reg == A_TP_RXT_MIN || reg == A_TP_RXT_MAX ||
-	    reg == A_TP_PERS_MIN || reg == A_TP_PERS_MAX ||
-	    reg == A_TP_KEEP_IDLE || A_TP_KEEP_INTVL || reg == A_TP_INIT_SRTT ||
-	    reg == A_TP_FINWAIT2_TIMER);
+	    reg == A_TP_PERS_MIN  || reg == A_TP_PERS_MAX ||
+	    reg == A_TP_KEEP_IDLE || reg == A_TP_KEEP_INTVL ||
+	    reg == A_TP_INIT_SRTT || reg == A_TP_FINWAIT2_TIMER);
 
 	tre = G_TIMERRESOLUTION(t4_read_reg(sc, A_TP_TIMER_RESOLUTION));
 	tp_tick_us = (cclk_ps << tre) / 1000000;


More information about the svn-src-head mailing list