drivers/net/igbvf/netdev.c: use %pM to shown MAC address
Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
557b0bbd62
commit
753cdc3304
|
@ -2608,11 +2608,7 @@ static void igbvf_print_device_info(struct igbvf_adapter *adapter)
|
||||||
struct pci_dev *pdev = adapter->pdev;
|
struct pci_dev *pdev = adapter->pdev;
|
||||||
|
|
||||||
dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
|
dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
|
||||||
dev_info(&pdev->dev, "Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr);
|
||||||
/* MAC address */
|
|
||||||
netdev->dev_addr[0], netdev->dev_addr[1],
|
|
||||||
netdev->dev_addr[2], netdev->dev_addr[3],
|
|
||||||
netdev->dev_addr[4], netdev->dev_addr[5]);
|
|
||||||
dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
|
dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2777,11 +2773,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
|
||||||
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
|
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
|
||||||
|
|
||||||
if (!is_valid_ether_addr(netdev->perm_addr)) {
|
if (!is_valid_ether_addr(netdev->perm_addr)) {
|
||||||
dev_err(&pdev->dev, "Invalid MAC Address: "
|
dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
|
||||||
"%02x:%02x:%02x:%02x:%02x:%02x\n",
|
netdev->dev_addr);
|
||||||
netdev->dev_addr[0], netdev->dev_addr[1],
|
|
||||||
netdev->dev_addr[2], netdev->dev_addr[3],
|
|
||||||
netdev->dev_addr[4], netdev->dev_addr[5]);
|
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto err_hw_init;
|
goto err_hw_init;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue