From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AFE6BA0527 for ; Mon, 9 Nov 2020 19:44:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A67186A6F; Mon, 9 Nov 2020 19:44:19 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by dpdk.org (Postfix) with ESMTP id C8CDB6A6F for ; Mon, 9 Nov 2020 19:44:17 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id k2so6491773wrx.2 for ; Mon, 09 Nov 2020 10:44:17 -0800 (PST) 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=AYkE5HiZfFWpPn0EvgaBBeQnb0z8Wt4XerYc1m/pvkQ=; b=S6gohwauAJwCI/lkiV+mQc8oXlZnapd1Y+qOSbkCdG84qIJvSdIJDZ0fLCda4Jnb8c URFouHPKBQDRTxRvTQpuqgWe5n2ln44BaRGibZXrUDUuw/U8+jqSLklHQZIXz6vy7QuR F4JZacP7xg+ix2G344uEutObRqEbWxEgf93JjdfehNEL65Tig3HVizxLde0vZrpG65QZ n3CKb8TLRB0aaM5SOO4kK9KwP9qPVrRicVRi01kKupKgi4to8f1e0k8xWfnX7oOuzv55 qIY//iTIxlwx9023874zTh1nLFQeEoHswJ0jwp0d+5Ii143nrXlecyvyV5Dqx4PlfP/Y DN0A== 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=AYkE5HiZfFWpPn0EvgaBBeQnb0z8Wt4XerYc1m/pvkQ=; b=ugsw51xVqQoBJd+vnJ+HWTz+gb9B5YQGczIEkQ+4DGJRSJ//Ax+opcto5+Okkap4Tt X10ZGzmyw0iCUOyXfi/mYtm3nOpJU+AjRSO7VQB6BqLNdRqHxlcxl0Ga9nX5caKbbV+w zAKYEy33rN0iIYiZLBgZClMy91aU6ZAEdVt5AkW/ltE6JrFLvDxUt6YADGZJg2H8By+D HBo6g1W1jN8fyzYcIaA0k/dMgNkB5MG92CbUhsYXcgSII1+adrwIV7rwlJ9UreTPbFmI bi4RV9pz5yI2SD8j3TukZ8DOQLVzsOxloLLNdU659xjAPykFJ6PEiQbrVO4u3nDE9fF5 YZFw== X-Gm-Message-State: AOAM531Lrp3Lj4C+NapNv5lM01hr6ab9dsAt5gtmxZC2pNYBHu4bsaIA GSDr5mDL/5wBeqIwtKj5mQb8QM0SH1dH0vq1 X-Google-Smtp-Source: ABdhPJwhlMSyf8fo3N3dD72yDGZM38ebkO6KJDsp+cfb2z6A1KkhAjNXD/uMk7sxVnOjnb/dLeyaOQ== X-Received: by 2002:adf:f846:: with SMTP id d6mr2131500wrq.128.1604947456533; Mon, 09 Nov 2020 10:44:16 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p10sm14043927wre.2.2020.11.09.10.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:15 -0800 (PST) From: luca.boccassi@gmail.com To: Lance Richardson Cc: Ajit Khaparde , dpdk stable Date: Mon, 9 Nov 2020 18:40:41 +0000 Message-Id: <20201109184111.3463090-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix boolean operator usage' has been queued to stable release 19.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/25bce6cab35c1db26eac436dee5e6c145468fd5f Thanks. Luca Boccassi --- >From 25bce6cab35c1db26eac436dee5e6c145468fd5f Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Thu, 22 Oct 2020 14:45:10 -0400 Subject: [PATCH] net/bnxt: fix boolean operator usage [ upstream commit 47b70761670dc8b5bb8399df280476d9767b11df ] Use boolean AND operator instead of bitwise operator. Coverity issue: 323488 Fixes: b42c15c83e88 ("net/bnxt: support trusted VF") Signed-off-by: Lance Richardson Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 65527a0637..6b69172990 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1088,7 +1088,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, if (rc) return rc; - if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) { + if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp)) { PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n"); return -ENOTSUP; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.242912988 +0000 +++ 0053-net-bnxt-fix-boolean-operator-usage.patch 2020-11-09 18:40:11.183312091 +0000 @@ -1 +1 @@ -From 47b70761670dc8b5bb8399df280476d9767b11df Mon Sep 17 00:00:00 2001 +From 25bce6cab35c1db26eac436dee5e6c145468fd5f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 47b70761670dc8b5bb8399df280476d9767b11df ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8025e33e9a..6757d36825 100644 +index 65527a0637..6b69172990 100644 @@ -22 +23 @@ -@@ -1550,7 +1550,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, +@@ -1088,7 +1088,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,