[PATCH stable v5.4] bnxt_en: Remove the setting of dev_port.

[PATCH stable v5.4] bnxt_en: Remove the setting of dev_port.

[Krzysztof Kozlowski]

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>

---

For stable v5.4. Earlier could work as well, just did not check.

Reported for Ubuntu backport here:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1931245
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 106f2b2ce17f..66b0c917fe50 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7002,7 +7002,6 @@ static 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);
 		pf->first_vf_id = le16_to_cpu(resp->first_vf_id);
 		pf->max_vfs = le16_to_cpu(resp->max_vfs);
-- 
2.27.0

Re: [PATCH stable v5.4] bnxt_en: Remove the setting of dev_port.

[Greg KH]

On Tue, Jun 08, 2021 at 04:46:21PM +0200, Krzysztof Kozlowski wrote:
> 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>
> 
> ---
> 
> For stable v5.4. Earlier could work as well, just did not check.
> 
> Reported for Ubuntu backport here:
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1931245
> ---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 -
>  1 file changed, 1 deletion(-)

Now queued up, thanks.

greg k-h