diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2009-12-29 23:02:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-29 23:02:29 -0500 |
commit | 753cdc3304f0612766a81cddab9d8af01fcf8218 (patch) | |
tree | 9043900b51c70739d49a5775ddcec7e2ac1c6034 /drivers/net/igbvf | |
parent | 557b0bbd62389ab438424e9f895197607666ea4d (diff) |
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>
Diffstat (limited to 'drivers/net/igbvf')
-rw-r--r-- | drivers/net/igbvf/netdev.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index e9dd95f136aa..1326232c1d32 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
@@ -2608,11 +2608,7 @@ static void igbvf_print_device_info(struct igbvf_adapter *adapter) | |||
2608 | struct pci_dev *pdev = adapter->pdev; | 2608 | struct pci_dev *pdev = adapter->pdev; |
2609 | 2609 | ||
2610 | dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n"); | 2610 | dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n"); |
2611 | dev_info(&pdev->dev, "Address: %02x:%02x:%02x:%02x:%02x:%02x\n", | 2611 | dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr); |
2612 | /* MAC address */ | ||
2613 | netdev->dev_addr[0], netdev->dev_addr[1], | ||
2614 | netdev->dev_addr[2], netdev->dev_addr[3], | ||
2615 | netdev->dev_addr[4], netdev->dev_addr[5]); | ||
2616 | dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type); | 2612 | dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type); |
2617 | } | 2613 | } |
2618 | 2614 | ||
@@ -2777,11 +2773,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, | |||
2777 | memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); | 2773 | memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); |
2778 | 2774 | ||
2779 | if (!is_valid_ether_addr(netdev->perm_addr)) { | 2775 | if (!is_valid_ether_addr(netdev->perm_addr)) { |
2780 | dev_err(&pdev->dev, "Invalid MAC Address: " | 2776 | dev_err(&pdev->dev, "Invalid MAC Address: %pM\n", |
2781 | "%02x:%02x:%02x:%02x:%02x:%02x\n", | 2777 | netdev->dev_addr); |
2782 | netdev->dev_addr[0], netdev->dev_addr[1], | ||
2783 | netdev->dev_addr[2], netdev->dev_addr[3], | ||
2784 | netdev->dev_addr[4], netdev->dev_addr[5]); | ||
2785 | err = -EIO; | 2778 | err = -EIO; |
2786 | goto err_hw_init; | 2779 | goto err_hw_init; |
2787 | } | 2780 | } |