[dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

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 <guinanx.sun at intel.com>
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 <guinanx.sun at intel.com>
Acked-by: Kevin Traynor <ktraynor at redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 <guinanx.sun at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
 Acked-by: Kevin Traynor <ktraynor at redhat.com>