Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 May 2019 14:52:51 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r347529 - stable/12/sys/net
Message-ID:  <201905131452.x4DEqphq029872@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon May 13 14:52:50 2019
New Revision: 347529
URL: https://svnweb.freebsd.org/changeset/base/347529

Log:
  MFC r347031: iflib: remove assertion that isc_capabilities is nonzero
  
  It's atypical, but not invalid, for a driver to pass no capabilities.
  
  Submitted by:	Gerald Aryeetey <aryeeteygerald_rogers.com>
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/sys/net/iflib.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/iflib.c
==============================================================================
--- stable/12/sys/net/iflib.c	Mon May 13 14:50:51 2019	(r347528)
+++ stable/12/sys/net/iflib.c	Mon May 13 14:52:50 2019	(r347529)
@@ -4444,7 +4444,6 @@ iflib_device_register(device_t dev, void *sc, if_share
 	ctx->ifc_txrx = *scctx->isc_txrx;
 
 #ifdef INVARIANTS
-	MPASS(scctx->isc_capabilities);
 	if (scctx->isc_capabilities & IFCAP_TXCSUM)
 		MPASS(scctx->isc_tx_csum_flags);
 #endif
@@ -4678,7 +4677,6 @@ iflib_pseudo_register(device_t dev, if_shared_ctx_t sc
 	ifmedia_set(&ctx->ifc_media, IFM_ETHER | IFM_AUTO);
 
 #ifdef INVARIANTS
-	MPASS(scctx->isc_capabilities);
 	if (scctx->isc_capabilities & IFCAP_TXCSUM)
 		MPASS(scctx->isc_tx_csum_flags);
 #endif



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