Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f70b8b authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

bnxt_en: fix switchdev port naming for external-port-rep and vf-reps 



Fix the phys_port_name for the external physical port to be in
"pA" format and that of VF-rep to be in "pCvfD" format as
suggested by Jakub Kicinski.

Fixes: c124a62f ("bnxt_en: add support for port_attr_get and get_phys_port_name")
Signed-off-by: default avatarSathya Perla <sathya.perla@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e408ebdc

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

+1 −5
Original line number Diff line number Diff line
@@ -7552,11 +7552,7 @@ static int bnxt_get_phys_port_name(struct net_device *dev, char *buf, 
	if (!BNXT_PF(bp))

		return -EOPNOTSUPP;



	/* The switch-id that the pf belongs to is exported by

	 * the switchdev ndo. This name is just to distinguish from the

	 * vf-rep ports.

	 */

	rc = snprintf(buf, len, "pf%d", bp->pf.port_id);

	rc = snprintf(buf, len, "p%d", bp->pf.port_id);



	if (rc >= len)

		return -EOPNOTSUPP;

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+3 −1
Original line number Diff line number Diff line
@@ -141,9 +141,11 @@ static int bnxt_vf_rep_get_phys_port_name(struct net_device *dev, char *buf, 
					  size_t len)

{

	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);

	struct pci_dev *pf_pdev = vf_rep->bp->pdev;

	int rc;



	rc = snprintf(buf, len, "vfr%d", vf_rep->vf_idx);

	rc = snprintf(buf, len, "pf%dvf%d", PCI_FUNC(pf_pdev->devfn),

		      vf_rep->vf_idx);

	if (rc >= len)

		return -EOPNOTSUPP;

	return 0;