From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E5415A0C4C for ; Mon, 12 Jul 2021 15:10:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF3A14069D; Mon, 12 Jul 2021 15:10:47 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 937A94069D for ; Mon, 12 Jul 2021 15:10:47 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id t5so11689801wrw.12 for ; Mon, 12 Jul 2021 06:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XKFQ+Tlo14NFBliR9s10mpi6Ns4+grGLKijp7cG27F8=; b=VKw8BqKWWkINoZXK6BX5BUGXGOkMYCAjdGVr0A0jPhWDElCoxGlbfVEcBYCXUKpHqd DRbMQVsASp1z+go0TcqtRqJSvYs8mc4tGZ1RVokL6nv+lmavfehiCywASD3KjpyOA2Bx Vubn8kJnl8JyvlhNeMv8fiWYk5WfLl/cqwCFGSicGs7GKtPyou+FjfJEVi9NsMN5y2Wi dnQTLH7LBnoF5yquygUV3fpaorFbcIBXNT8vQe01YE3CBg1O+FbKiHns7s33SeaDdMIV c1XHRVkW1hGETJRKMn2h0KjLeZfYRY3C3eti7oFtlBRXBrrbOLmcSIp2GJwyYmRk4a1N lvfQ== 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:mime-version:content-transfer-encoding; bh=XKFQ+Tlo14NFBliR9s10mpi6Ns4+grGLKijp7cG27F8=; b=tr4KlStk65IRpIKHcHxPIpdPggI0poh0O0dbsFEjth3/n3KNio2eHb+WMyj8FHFEVe 0MfB/dydlRGmRa7jA36Th2iw9ZDuToK3LmvjKdGN+y9zCnRhsxFz0tKOsgNm9kvtreqZ 0DqV0tL0DMCGkt6epkTy/3/q97Zjq0GXGluVBw4/dsKwVOQo5+3Cw/5l8M0op4+ICYgX t78vTU0OwCZ+lwhs7uhxoxrNXEMwAnV+u6DWmgHDuWVM8oiMM3B9P46LNg2EEq2iU7Kc XDYAltDAUjfYJEglFzCB3xsA6Os5+Z0QXeXZb8cpmxsk2dwFpfHgBRBU0OmyMsd5ECMy qB0g== X-Gm-Message-State: AOAM5305S5yzQxfM2HwmA3r5EPc5OPzHAYjKgeSyFmF8eai+3miOg9eh OHpOO+fFB7qW3IcHxgQDgIQ= X-Google-Smtp-Source: ABdhPJz1Cy23Pb0R+5RKP6kPuaLOotqc1+gkHM+PhzPHEn9T3dyEGmL2W4OcnjwCNE0/S4NPMIFV0w== X-Received: by 2002:a5d:4252:: with SMTP id s18mr58470929wrr.88.1626095447406; Mon, 12 Jul 2021 06:10:47 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c10sm12549626wmb.40.2021.07.12.06.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:10:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Beilei Xing , dpdk stable Date: Mon, 12 Jul 2021 14:04:14 +0100 Message-Id: <20210712130551.2462159-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix handling of unsupported promiscuous' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d5052b1a2e17fa17d1e9ae8ceb5553fe6bb59813 Thanks. Luca Boccassi --- >From d5052b1a2e17fa17d1e9ae8ceb5553fe6bb59813 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 26 May 2021 17:53:05 +0800 Subject: [PATCH] net/iavf: fix handling of unsupported promiscuous [ upstream commit 50937e495f5bcc5985365b3b93e34b6efffeca10 ] iavf_execute_vf_cmd returns standard error code but not IAVF_xxx, The patch fix the wrong error handling in iavf_config_promisc. Fixes: 1e4d55a7fe71 ("net/iavf: optimize promiscuous device operations") Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_vchnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 064133785e..1021108ff5 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -1107,8 +1107,8 @@ iavf_config_promisc(struct iavf_adapter *adapter, PMD_DRV_LOG(ERR, "fail to execute command CONFIG_PROMISCUOUS_MODE"); - if (err == IAVF_NOT_SUPPORTED) - return -ENOTSUP; + if (err == -ENOTSUP) + return err; return -EAGAIN; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:37.823758998 +0100 +++ 0019-net-iavf-fix-handling-of-unsupported-promiscuous.patch 2021-07-12 13:41:36.238117361 +0100 @@ -1 +1 @@ -From 50937e495f5bcc5985365b3b93e34b6efffeca10 Mon Sep 17 00:00:00 2001 +From d5052b1a2e17fa17d1e9ae8ceb5553fe6bb59813 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 50937e495f5bcc5985365b3b93e34b6efffeca10 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5d57e8b541..02e828f9b7 100644 +index 064133785e..1021108ff5 100644 @@ -22 +23 @@ -@@ -1257,8 +1257,8 @@ iavf_config_promisc(struct iavf_adapter *adapter, +@@ -1107,8 +1107,8 @@ iavf_config_promisc(struct iavf_adapter *adapter,