From 8691809d9390c3cdb94785e18488e6315075e0ba Mon Sep 17 00:00:00 2001

From: Michael Chan <michael.chan@broadcom.com>

Date: Mon, 27 Jan 2020 04:56:15 -0500

Subject: [PATCH 1/2] bnxt_en: Remove the setting of dev_port.

References: git-fixes

Git-commit: 1d86859fdf31a0d50cc82b5d0d6bfb5fe98f6c00

Patch-mainline: v5.6-rc1

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: Denis Kirjanov <denis.kirjanov@suse.com>

---

 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 0f6ba7b412a0..b1dbacc8d6d5 100644

--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c

+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c

@@ -6581,7 +6581,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.16.4