From: Michael Chan <michael.chan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org,
Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Subject: [PATCH net-next 13/16] bnxt_en: Rename switch_id to dsn
Date: Sun, 26 Jan 2020 04:03:07 -0500 [thread overview]
Message-ID: <1580029390-32760-14-git-send-email-michael.chan@broadcom.com> (raw)
In-Reply-To: <1580029390-32760-1-git-send-email-michael.chan@broadcom.com>
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Instead of switch_id, renaming it to dsn will be more meaningful
so that it can be used to display device serial number in follow up
patch via devlink_info command.
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8579415..483935b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -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 */
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index cb2b833..1f6ea58 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1849,7 +1849,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;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 265a68c..35e2a22 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -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");
--
2.5.1
next prev parent reply other threads:[~2020-01-26 9:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
2020-01-26 9:02 ` [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload Michael Chan
2020-01-27 0:12 ` Jakub Kicinski
2020-01-26 9:02 ` [PATCH net-next 02/16] bnxt_en: Improve link up detection Michael Chan
2020-01-26 9:02 ` [PATCH net-next 03/16] bnxt_en: Improve bnxt_probe_phy() Michael Chan
2020-01-26 9:02 ` [PATCH net-next 04/16] bnxt_en: Remove the setting of dev_port Michael Chan
2020-01-26 9:02 ` [PATCH net-next 05/16] bnxt_en: Support UDP RSS hashing on 575XX chips Michael Chan
2020-01-26 9:03 ` [PATCH net-next 06/16] bnxt_en: Do not accept fragments for aRFS flow steering Michael Chan
2020-01-26 9:03 ` [PATCH net-next 07/16] bnxt_en: Periodically check and remove aged-out ntuple filters Michael Chan
2020-01-26 9:03 ` [PATCH net-next 08/16] bnxt_en: Disable workaround for lost interrupts on 575XX B0 and newer chips Michael Chan
2020-01-26 9:03 ` [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register() Michael Chan
2020-01-26 11:32 ` Jiri Pirko
2020-01-27 4:51 ` Vasundhara Volam
2020-01-26 9:03 ` [PATCH net-next 10/16] bnxt_en: Register devlink irrespective of firmware spec version Michael Chan
2020-01-26 9:03 ` [PATCH net-next 11/16] bnxt_en: Move devlink_register before registering netdev Michael Chan
2020-01-26 9:03 ` [PATCH net-next 12/16] bnxt_en: Add support to update progress of flash update Michael Chan
2020-01-26 9:03 ` Michael Chan [this message]
2020-01-26 9:03 ` [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg" Michael Chan
2020-01-27 0:18 ` Jakub Kicinski
2020-01-27 5:42 ` Vasundhara Volam
2020-01-27 14:25 ` Jakub Kicinski
2020-01-26 9:03 ` [PATCH net-next 15/16] bnxt_en: Add support for devlink info command Michael Chan
2020-01-26 9:03 ` [PATCH net-next 16/16] devlink: document devlink info versions reported by bnxt_en driver Michael Chan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1580029390-32760-14-git-send-email-michael.chan@broadcom.com \
--to=michael.chan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=vasundhara-v.volam@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).