4.14-stable patches

added patches:
	bnxt_en-remove-the-setting-of-dev_port.patch

diff --git a/queue-4.14/bnxt_en-remove-the-setting-of-dev_port.patch b/queue-4.14/bnxt_en-remove-the-setting-of-dev_port.patch
new file mode 100644 (file)
index 0000000..21dd9a0
--- /dev/null
+++ b/queue-4.14/bnxt_en-remove-the-setting-of-dev_port.patch
@@ -0,0 +1,32 @@
+From 1d86859fdf31a0d50cc82b5d0d6bfb5fe98f6c00 Mon Sep 17 00:00:00 2001
+From: Michael Chan <michael.chan@broadcom.com>
+Date: Mon, 27 Jan 2020 04:56:15 -0500
+Subject: bnxt_en: Remove the setting of dev_port.
+
+From: Michael Chan <michael.chan@broadcom.com>
+
+commit 1d86859fdf31a0d50cc82b5d0d6bfb5fe98f6c00 upstream.
+
+The dev_port is meant to distinguish the network ports belonging to
+the same PCI function.  Our devices only have one network port
+associated with each PCI function and so we should not set it for
+correctness.
+
+Signed-off-by: Michael Chan <michael.chan@broadcom.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
++++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+@@ -4791,7 +4791,6 @@ static int bnxt_hwrm_func_qcaps(struct b
+ 
+               pf->fw_fid = le16_to_cpu(resp->fid);
+               pf->port_id = le16_to_cpu(resp->port_id);
+-              bp->dev->dev_port = pf->port_id;
+               memcpy(pf->mac_addr, resp->mac_address, ETH_ALEN);
+               pf->max_rsscos_ctxs = le16_to_cpu(resp->max_rsscos_ctx);
+               pf->max_cp_rings = le16_to_cpu(resp->max_cmpl_rings);

diff --git a/queue-4.14/series b/queue-4.14/series
index 2728766e4a67b4533d645ee938fc250fc3761e86..8ef9dff2ac488446a96b95df0a116655a0bb79e3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -41,3 +41,4 @@ bpf-fix-leakage-of-uninitialized-bpf-stack-under-speculation.patch
 bpf-wrap-aux-data-inside-bpf_sanitize_info-container.patch
 bpf-fix-mask-direction-swap-upon-off-reg-sign-change.patch
 bpf-no-need-to-simulate-speculative-domain-for-immediates.patch
+bnxt_en-remove-the-setting-of-dev_port.patch