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 67545A04A3 for ; Fri, 5 Jun 2020 20:28:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5FB421D515; Fri, 5 Jun 2020 20:28:05 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 2534A1D515 for ; Fri, 5 Jun 2020 20:28:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O02crG+f/uR9/Ur5gPPHkya0qLXwdi61J7K9urzs2QU=; b=N0QOdS2ehoT6gb6slK7OutWLJ+b7UsTI++gczhUvgmN9x2wSTv8FdZbJJKFraJsoxPjqIL fjym7+8gGtyj6QMJpvWcBtETc+IWyL3VKi4OeEmWcw4WkjW8nqQBy05NGyvTJF2/r92DEt R2DFst2ah75oLTwTfo1Q5d5b61eLHxc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-Xj3lYwGVPYKr-pC9BzBx5A-1; Fri, 05 Jun 2020 14:28:00 -0400 X-MC-Unique: Xj3lYwGVPYKr-pC9BzBx5A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B8F6835B8C; Fri, 5 Jun 2020 18:27:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D23C60C47; Fri, 5 Jun 2020 18:27:58 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Kevin Traynor , Ferruh Yigit , dpdk stable Date: Fri, 5 Jun 2020 19:25:19 +0100 Message-Id: <20200605182525.22483-82-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 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/10/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/224d1b6c3f9e15077a99b67bee8ad5cab787904a Thanks. Kevin. --- >From 224d1b6c3f9e15077a99b67bee8ad5cab787904a 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 b946808bc2..62376bdad7 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c @@ -522,4 +522,7 @@ 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; @@ -542,4 +545,7 @@ 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); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:55.284400467 +0100 +++ 0082-net-ixgbe-check-driver-type-in-MACsec-API.patch 2020-06-05 19:20:50.986036815 +0100 @@ -1 +1 @@ -From dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 Mon Sep 17 00:00:00 2001 +From 224d1b6c3f9e15077a99b67bee8ad5cab787904a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8bcaded6e5..9bff557f97 100644 +index b946808bc2..62376bdad7 100644 @@ -22 +23 @@ -@@ -523,4 +523,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp) +@@ -522,4 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp) @@ -30 +31 @@ -@@ -543,4 +546,7 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port) +@@ -542,4 +545,7 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port)