From: Greg Kroah-Hartman Date: Tue, 8 Jun 2021 15:01:26 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.272~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ecbd0cf77b5adfd3073421e5fc13ce11cd5bba9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: bnxt_en-remove-the-setting-of-dev_port.patch --- diff --git a/queue-4.9/bnxt_en-remove-the-setting-of-dev_port.patch b/queue-4.9/bnxt_en-remove-the-setting-of-dev_port.patch new file mode 100644 index 00000000000..07e845b9aa2 --- /dev/null +++ b/queue-4.9/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 +Date: Mon, 27 Jan 2020 04:56:15 -0500 +Subject: bnxt_en: Remove the setting of dev_port. + +From: Michael Chan + +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 +Signed-off-by: David S. Miller +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -4262,7 +4262,6 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp + + 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); + memcpy(bp->dev->dev_addr, pf->mac_addr, ETH_ALEN); + pf->max_rsscos_ctxs = le16_to_cpu(resp->max_rsscos_ctx); diff --git a/queue-4.9/series b/queue-4.9/series index dc0362dccdb..dc7c7878cc2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -23,3 +23,4 @@ ocfs2-fix-data-corruption-by-fallocate.patch nfc-fix-null-ptr-dereference-in-llcp_sock_getname-after-failed-connect.patch btrfs-fix-error-handling-in-btrfs_del_csums.patch btrfs-fixup-error-handling-in-fixup_inode_link_counts.patch +bnxt_en-remove-the-setting-of-dev_port.patch