From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id 824792C8 for ; Tue, 20 Jun 2017 13:37:22 +0200 (CEST) Received: by mail-pf0-f194.google.com with SMTP id y7so22252460pfd.3 for ; Tue, 20 Jun 2017 04:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=REHwy0HDpq5hOnZfVDdL3Ap+GAAOa1HSo80DkOSPWE0=; b=afs8shfXeXU3VElTU7fP+ZnWkqSlp7KENRy3apxYQfSr3XoBv19WJwhwz3+BZoFybw 3iDvbRWLb+IK1S+UcDwCbOIRcmLwW3WPWkO2LjA9sNhACeOoiDetctBT94COjOcnTbE/ xyQzEI1UZWwzGzhmdUwZcUQ9sYrGxU+Rzgp5fVag572apv6qHrtHiRwrNt0TRPjGvbol 3/oUmf3nNlkYq1IBRFqnEXpggM5LXpGYSw6BsK6gouVnQxpUUHKEWzEYdpMZ6/knGNjN 8Hd1SRfOXnbkwKP01VzU+a2O4cC5VdDXYP9stl+7lAFQAMbWitf94+CiqodhRJDXLqGu ufzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=REHwy0HDpq5hOnZfVDdL3Ap+GAAOa1HSo80DkOSPWE0=; b=txuQh2kMIYOGY/RvhS/zw4jM1F/O9nC5azirm+WusT97cyBMUvTxad/rL0zO0JkXgi MO9+5LQReiFPz3Hn7kyZErdl1zxrHw9HYdV98YvlaDZYlVo0KscpIJQZWkX1AzDExeIT dCU74ZcJySaV6If07E5i9sXryaz3caPMg7RHJrzqAQY9n0bi5JnezydlUQw3NP0Xt/RO qx9mlsAyjzkfAqUt1d/PowBZ21Nf/4XFzlz0T8xgFD8Eg2EYziUdsCDUlKjC1eOzrQCD NslzHfQYWRf25P2g1h7/RgbP9YdYDVuGM1V5kWmUWTqzggoN7xaIBJij9jrn+sTdP7E0 Jd3Q== X-Gm-Message-State: AKS2vOx7PK3AGOzJUjzRbQJTlS/vZF8KWxvza+m83DpRwbkcIrmIQVlA pUh7UbVYWX6wD2M2KGZeyg== X-Received: by 10.99.140.79 with SMTP id q15mr28110977pgn.140.1497958641752; Tue, 20 Jun 2017 04:37:21 -0700 (PDT) Received: from yliu-home.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id 25sm6104783pfj.59.2017.06.20.04.37.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 04:37:20 -0700 (PDT) From: Yuanhan Liu To: Andy Moreton Cc: Andrew Rybchenko , dpdk stable Date: Tue, 20 Jun 2017 19:35:30 +0800 Message-Id: <1497958550-13600-18-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org> References: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' has been queued to stable release 17.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jun 2017 11:37:22 -0000 Hi, FYI, your patch has been queued to stable release 17.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/22/17. So please shout if anyone has objections. Thanks. --yliu --- >>From f2c835cd8aa6351ff8cd4667e910192b96dd2be6 Mon Sep 17 00:00:00 2001 From: Andy Moreton Date: Sat, 27 May 2017 08:55:30 +0100 Subject: [PATCH] net/sfc/base: fix error code usage in common code [ upstream commit 7236d2bfe0acc48330e3c2a3dfac4ada9a792cd8 ] 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. Fixes: e7cd430c864f ("net/sfc/base: import SFN7xxx family support") Signed-off-by: Andy Moreton Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_rx.c | 2 +- drivers/net/sfc/base/ef10_tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c index b65faed..9d6756c 100644 --- a/drivers/net/sfc/base/ef10_rx.c +++ b/drivers/net/sfc/base/ef10_rx.c @@ -137,7 +137,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; } diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c index 0f8e9b1..dfa9e0b 100644 --- a/drivers/net/sfc/base/ef10_tx.c +++ b/drivers/net/sfc/base/ef10_tx.c @@ -148,7 +148,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; } -- 2.7.4