diff options
| author |   Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> | 2010-05-17 01:22:09 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-05-17 17:30:53 -0700 |
| commit | 02f6e46f352d52bd88ab3f63e9546ecc6a16e385 (patch) | |
| tree | f9ea5f295e1b8d980debdac172a5299f42aa2629 /drivers/net | |
| parent | qlcnic: fix memory leaks (diff) | |
| download | linux-dev-02f6e46f352d52bd88ab3f63e9546ecc6a16e385.tar.xz linux-dev-02f6e46f352d52bd88ab3f63e9546ecc6a16e385.zip | |
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>
Diffstat (limited to '')
| -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) qlcnic_boards[i].device == pdev->device && qlcnic_boards[i].sub_vendor == pdev->subsystem_vendor && qlcnic_boards[i].sub_device == pdev->subsystem_device) { - strcpy(name, qlcnic_boards[i].short_name); + sprintf(name, "%pM: %s" , + adapter->mac_addr, + qlcnic_boards[i].short_name); found = 1; break; } @@ -1083,6 +1085,9 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_iounmap; } + if (qlcnic_read_mac_addr(adapter)) + dev_warn(&pdev->dev, "failed to read mac addr\n"); + if (qlcnic_setup_idc_param(adapter)) goto err_out_iounmap; |