bnxt_en: Rename switch_id to dsn (b014232f) · Commits · 戴 / test

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -11388,8 +11388,8 @@ int bnxt_get_port_parent_id(struct net_device *dev,
		if (!BNXT_PF(bp) \|\| !(bp->flags & BNXT_FLAG_DSN_VALID))
		return -EOPNOTSUPP;

		ppid->id_len = sizeof(bp->switch_id);
		memcpy(ppid->id, bp->switch_id, ppid->id_len);
		ppid->id_len = sizeof(bp->dsn);
		memcpy(ppid->id, bp->dsn, ppid->id_len);

		return 0;
		}
		@@ -11870,7 +11870,7 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)

		if (BNXT_PF(bp)) {
		/* Read the adapter's DSN to use as the eswitch switch_id */
		bnxt_pcie_dsn_get(bp, bp->switch_id);
		rc = bnxt_pcie_dsn_get(bp, bp->dsn);
		}

		/* MTU range: 60 - FW defined max */

+1 −1

Original line number	Diff line number	Diff line
		@@ -1848,7 +1848,7 @@ struct bnxt {
		enum devlink_eswitch_mode eswitch_mode;
		struct bnxt_vf_rep *vf_reps; / array of vf-rep ptrs */
		u16 cfa_code_map; / cfa_code -> vf_idx map */
		u8 switch_id[8];
		u8 dsn[8];
		struct bnxt_tc_info *tc_info;
		struct list_head tc_indr_block_list;
		struct notifier_block tc_netdev_nb;

+2 −2

Original line number	Diff line number	Diff line
		@@ -566,8 +566,8 @@ int bnxt_dl_register(struct bnxt *bp)
		return 0;

		devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
		bp->pf.port_id, false, 0,
		bp->switch_id, sizeof(bp->switch_id));
		bp->pf.port_id, false, 0, bp->dsn,
		sizeof(bp->dsn));
		rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
		if (rc) {
		netdev_err(bp->dev, "devlink_port_register failed");