From fd9e94ef5a08700d3ece58702d7ae57766341344 Mon Sep 17 00:00:00 2001 From: Sucheta Chakraborty Date: Mon, 17 May 2010 01:22:09 +0000 Subject: [PATCH] --- yaml --- r: 195159 b: refs/heads/master c: 02f6e46f352d52bd88ab3f63e9546ecc6a16e385 h: refs/heads/master i: 195157: 7747bbf5282485974edcd35199b95bb1e6fa5275 195155: 535389181040f5d6df71aeb92b9dac03d8dbce2c 195151: 646e84cc2c543d72fd584ea9544dbc28ba62977a v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5bee487c0ea2..8f7e8d24b370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aadd8184ae4b3f0c7874929a1b0248aafc29e509 +refs/heads/master: 02f6e46f352d52bd88ab3f63e9546ecc6a16e385 diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index f1949c93ab25..db0563557e19 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/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;