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 CBF4CA04A4 for ; Wed, 27 May 2020 11:25:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4BD71D654; Wed, 27 May 2020 11:25:12 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 2C3AD1D8FD for ; Wed, 27 May 2020 11:25:10 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id r7so6596692wro.1 for ; Wed, 27 May 2020 02:25:10 -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=hqLcrZXdwjtRUCbcFYDX9j1t70NpVKGN+iCqqY/A25Q=; b=K0zBg3T2rNvl/31Qou8CTsx+3+NdzVM8OlgXjRisWo4/QEiPipi6fxEiUcIYpNWs8l R4kfdqPlGYC0WVtYqaCUQx8urG7qbQ2Zy9BtD8eIlIOaLC9RVdoXEschWsy3/U/WJCdA UNKy3IhsoEBXVylVJ5kzfKlpVedLlnPhEGP0kIirVEEG3DGLM/1/3pN5AjM+8K08Py2g guMfSU+DdLS8AnIh9bMfthz0MEVLqHMBk48D7Qnu6GH5868yPkbg3PddlczFNK+Rdc4p CDC2WpnFrsDjYnEOs38YlnQqXjDZm3iFZifPN8hKGu5GCgk+0KidZWVFWfBh0DAODgev WNow== 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=hqLcrZXdwjtRUCbcFYDX9j1t70NpVKGN+iCqqY/A25Q=; b=f2S1gOnXQTavUof3vMidyo1PD7j8TQsMwYNWiXpOblwTSpdghqOX1s59cfFil30P/V 2WxE691vMN8XQStoEnV7CIvOsnwcQcOR0/eRkiUymbKDhxFDJpop6Q5SnmfVXqXB/o9A SwUnn8T93QDVPaCAWpUe69QVpIY3C6cfYNv1kmZiuruNsYpROGKhJNG3cXM966Cv9woP FDEM1q9naGwSU2Jnk3OfJIIAYPcn4mi0ZkWKu5697NlIFhNMN4h1219chqbyWu12Y5L7 na1qqr5JQkFl6ihcibfDKppDNcBzJfAwMmhHQyKW6a9jy/FSL4uNZTd+9YHOp7e87QTq YaWA== X-Gm-Message-State: AOAM5328V7+96Yz8nUbeYpkHH00iC4Jsro1HrJYPot7RJjEURMw99H1R C0kHSSU4zuIlaXzJ4/mPEgE= X-Google-Smtp-Source: ABdhPJywBhAGysranFn+SILiECb0gH/06tQ9j7PedXapxZ4uUW47ctnHvMtcBVHyhWl/ulr2CrhJGA== X-Received: by 2002:a05:6000:10c3:: with SMTP id b3mr25701378wrx.53.1590571509893; Wed, 27 May 2020 02:25:09 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b145sm2308914wme.41.2020.05.27.02.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:25:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Kevin Traynor , Ferruh Yigit , dpdk stable Date: Wed, 27 May 2020 10:24:17 +0100 Message-Id: <20200527092422.258652-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' has been queued to stable release 19.11.3 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.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 05/29/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. Thanks. Luca Boccassi --- >From d9da460ee380cead77aee168c9db8a27312b48df Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Fri, 22 May 2020 05:59:55 +0000 Subject: [PATCH] net/ixgbe: check driver type in MACsec API [ upstream commit dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 ] The driver type need to be checked in private API. Fixes: 50556c88104c ("net/ixgbe: fix MACsec setting") Signed-off-by: Guinan Sun Acked-by: Kevin Traynor Reviewed-by: Ferruh Yigit --- drivers/net/ixgbe/rte_pmd_ixgbe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c index 8bcaded6e5..9bff557f97 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c @@ -522,6 +522,9 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp) dev = &rte_eth_devices[port]; + if (!is_ixgbe_supported(dev)) + return -ENOTSUP; + macsec_setting.offload_en = 1; macsec_setting.encrypt_en = en; macsec_setting.replayprotect_en = rp; @@ -542,6 +545,9 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port) dev = &rte_eth_devices[port]; + if (!is_ixgbe_supported(dev)) + return -ENOTSUP; + ixgbe_dev_macsec_setting_reset(dev); ixgbe_dev_macsec_register_disable(dev); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:32.120579905 +0100 +++ 0014-net-ixgbe-check-driver-type-in-MACsec-API.patch 2020-05-27 10:23:31.647933907 +0100 @@ -1,12 +1,13 @@ -From dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 Mon Sep 17 00:00:00 2001 +From d9da460ee380cead77aee168c9db8a27312b48df Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Fri, 22 May 2020 05:59:55 +0000 Subject: [PATCH] net/ixgbe: check driver type in MACsec API +[ upstream commit dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 ] + The driver type need to be checked in private API. Fixes: 50556c88104c ("net/ixgbe: fix MACsec setting") -Cc: stable@dpdk.org Signed-off-by: Guinan Sun Acked-by: Kevin Traynor