diff options
author | Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> | 2010-05-16 21:22:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-17 20:30:53 -0400 |
commit | 02f6e46f352d52bd88ab3f63e9546ecc6a16e385 (patch) | |
tree | f9ea5f295e1b8d980debdac172a5299f42aa2629 | |
parent | aadd8184ae4b3f0c7874929a1b0248aafc29e509 (diff) |
qlcnic: change adapter name display
Append mac address to adapter name.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index f1949c93ab25..db0563557e19 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c | |||
@@ -495,7 +495,9 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name) | |||
495 | qlcnic_boards[i].device == pdev->device && | 495 | qlcnic_boards[i].device == pdev->device && |
496 | qlcnic_boards[i].sub_vendor == pdev->subsystem_vendor && | 496 | qlcnic_boards[i].sub_vendor == pdev->subsystem_vendor && |
497 | qlcnic_boards[i].sub_device == pdev->subsystem_device) { | 497 | qlcnic_boards[i].sub_device == pdev->subsystem_device) { |
498 | strcpy(name, qlcnic_boards[i].short_name); | 498 | sprintf(name, "%pM: %s" , |
499 | adapter->mac_addr, | ||
500 | qlcnic_boards[i].short_name); | ||
499 | found = 1; | 501 | found = 1; |
500 | break; | 502 | break; |
501 | } | 503 | } |
@@ -1083,6 +1085,9 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1083 | goto err_out_iounmap; | 1085 | goto err_out_iounmap; |
1084 | } | 1086 | } |
1085 | 1087 | ||
1088 | if (qlcnic_read_mac_addr(adapter)) | ||
1089 | dev_warn(&pdev->dev, "failed to read mac addr\n"); | ||
1090 | |||
1086 | if (qlcnic_setup_idc_param(adapter)) | 1091 | if (qlcnic_setup_idc_param(adapter)) |
1087 | goto err_out_iounmap; | 1092 | goto err_out_iounmap; |
1088 | 1093 | ||