svn commit: r301399 - stable/10/sys/dev/sfxge/common

Andrew Rybchenko arybchik at FreeBSD.org
Sat Jun 4 17:22:12 UTC 2016


Author: arybchik
Date: Sat Jun  4 17:22:10 2016
New Revision: 301399
URL: https://svnweb.freebsd.org/changeset/base/301399

Log:
  MFC r300847
  
  sfxge(4): cope with always true unsigned comparison with 0 to make lint happier
  
  Found by lint on illumos.
  
  Submitted by:   Garrett D'Amore <garrett at damore.org>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/ef10_rx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/ef10_rx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_rx.c	Sat Jun  4 17:20:50 2016	(r301398)
+++ stable/10/sys/dev/sfxge/common/ef10_rx.c	Sat Jun  4 17:22:10 2016	(r301399)
@@ -50,14 +50,15 @@ efx_mcdi_init_rxq(
 {
 	efx_mcdi_req_t req;
 	uint8_t payload[
-	    MAX(MC_CMD_INIT_RXQ_IN_LEN(EFX_RXQ_NBUFS(EFX_RXQ_MAXNDESCS)),
-		MC_CMD_INIT_RXQ_OUT_LEN)];
+	    MC_CMD_INIT_RXQ_IN_LEN(EFX_RXQ_NBUFS(EFX_RXQ_MAXNDESCS))];
 	int npages = EFX_RXQ_NBUFS(size);
 	int i;
 	efx_qword_t *dma_addr;
 	uint64_t addr;
 	efx_rc_t rc;
 
+	/* If this changes, then the payload size might need to change. */
+	EFSYS_ASSERT3U(MC_CMD_INIT_RXQ_OUT_LEN, ==, 0);
 	EFSYS_ASSERT3U(size, <=, EFX_RXQ_MAXNDESCS);
 
 	(void) memset(payload, 0, sizeof (payload));


More information about the svn-src-all mailing list