aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index abd492b7336d..a5c9266cd7ce 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4652,14 +4652,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
4652 u32 pba_num; 4652 u32 pba_num;
4653 4653
4654 /* print bus type/speed/width info */ 4654 /* print bus type/speed/width info */
4655 e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n", 4655 e_info("(PCI Express:2.5GB/s:%s) %pM\n",
4656 /* bus width */ 4656 /* bus width */
4657 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" : 4657 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
4658 "Width x1"), 4658 "Width x1"),
4659 /* MAC address */ 4659 /* MAC address */
4660 netdev->dev_addr[0], netdev->dev_addr[1], 4660 netdev->dev_addr);
4661 netdev->dev_addr[2], netdev->dev_addr[3],
4662 netdev->dev_addr[4], netdev->dev_addr[5]);
4663 e_info("Intel(R) PRO/%s Network Connection\n", 4661 e_info("Intel(R) PRO/%s Network Connection\n",
4664 (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000"); 4662 (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
4665 e1000e_read_pba_num(hw, &pba_num); 4663 e1000e_read_pba_num(hw, &pba_num);
@@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4906 memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); 4904 memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
4907 4905
4908 if (!is_valid_ether_addr(netdev->perm_addr)) { 4906 if (!is_valid_ether_addr(netdev->perm_addr)) {
4909 e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n", 4907 e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
4910 netdev->perm_addr[0], netdev->perm_addr[1],
4911 netdev->perm_addr[2], netdev->perm_addr[3],
4912 netdev->perm_addr[4], netdev->perm_addr[5]);
4913 err = -EIO; 4908 err = -EIO;
4914 goto err_eeprom; 4909 goto err_eeprom;
4915 } 4910 }