---

yaml
---
r: 195159
b: refs/heads/master
c: 02f6e46
h: refs/heads/master
i:
  195157: 7747bbf
  195155: 5353891
  195151: 646e84c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aadd8184ae4b3f0c7874929a1b0248aafc29e509
+refs/heads/master: 02f6e46f352d52bd88ab3f63e9546ecc6a16e385

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;