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

[Kevin Traynor]

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 <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 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 at 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)