Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 21 Dec 2018 15:02:36 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@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: r342308 - stable/12/sys/dev/sfxge/common
Message-ID:  <201812211502.wBLF2aKd035870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Fri Dec 21 15:02:36 2018
New Revision: 342308
URL: https://svnweb.freebsd.org/changeset/base/342308

Log:
  MFC r340799
  
  sfxge(4): fix error code usage
  
  MCDI results returned in req.emr_rc have already been translated
  from MC_CMD_ERR_* to errno names, so using an MC_CMD_ERR_* value
  is incorrect.
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18069

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

Modified: stable/12/sys/dev/sfxge/common/ef10_rx.c
==============================================================================
--- stable/12/sys/dev/sfxge/common/ef10_rx.c	Fri Dec 21 14:59:24 2018	(r342307)
+++ stable/12/sys/dev/sfxge/common/ef10_rx.c	Fri Dec 21 15:02:36 2018	(r342308)
@@ -130,7 +130,7 @@ efx_mcdi_fini_rxq(
 
 	efx_mcdi_execute_quiet(enp, &req);
 
-	if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) {
+	if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) {
 		rc = req.emr_rc;
 		goto fail1;
 	}

Modified: stable/12/sys/dev/sfxge/common/ef10_tx.c
==============================================================================
--- stable/12/sys/dev/sfxge/common/ef10_tx.c	Fri Dec 21 14:59:24 2018	(r342307)
+++ stable/12/sys/dev/sfxge/common/ef10_tx.c	Fri Dec 21 15:02:36 2018	(r342308)
@@ -151,7 +151,7 @@ efx_mcdi_fini_txq(
 
 	efx_mcdi_execute_quiet(enp, &req);
 
-	if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) {
+	if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) {
 		rc = req.emr_rc;
 		goto fail1;
 	}

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