diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 11 | 
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index abd492b7336..a5c9266cd7c 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)  	u32 pba_num;  	/* print bus type/speed/width info */ -	e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n", +	e_info("(PCI Express:2.5GB/s:%s) %pM\n",  	       /* bus width */  	       ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :  	        "Width x1"),  	       /* 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]); +	       netdev->dev_addr);  	e_info("Intel(R) PRO/%s Network Connection\n",  	       (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");  	e1000e_read_pba_num(hw, &pba_num); @@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,  	memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);  	if (!is_valid_ether_addr(netdev->perm_addr)) { -		e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n", -		      netdev->perm_addr[0], netdev->perm_addr[1], -		      netdev->perm_addr[2], netdev->perm_addr[3], -		      netdev->perm_addr[4], netdev->perm_addr[5]); +		e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);  		err = -EIO;  		goto err_eeprom;  	}  |