|
@@ -1047,15 +1047,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
|
|
goto err_register;
|
|
|
|
|
|
/* print bus type/speed/width info */
|
|
|
- e_info("(PCI%s:%s:%s) ",
|
|
|
- ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
|
|
|
- ((hw->bus_speed == e1000_bus_speed_133) ? "133MHz" :
|
|
|
- (hw->bus_speed == e1000_bus_speed_120) ? "120MHz" :
|
|
|
- (hw->bus_speed == e1000_bus_speed_100) ? "100MHz" :
|
|
|
- (hw->bus_speed == e1000_bus_speed_66) ? "66MHz" : "33MHz"),
|
|
|
- ((hw->bus_width == e1000_bus_width_64) ? "64-bit" : "32-bit"));
|
|
|
-
|
|
|
- e_info("%pM\n", netdev->dev_addr);
|
|
|
+ e_info("(PCI%s:%dMHz:%d-bit) %pM\n",
|
|
|
+ ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
|
|
|
+ ((hw->bus_speed == e1000_bus_speed_133) ? 133 :
|
|
|
+ (hw->bus_speed == e1000_bus_speed_120) ? 120 :
|
|
|
+ (hw->bus_speed == e1000_bus_speed_100) ? 100 :
|
|
|
+ (hw->bus_speed == e1000_bus_speed_66) ? 66 : 33),
|
|
|
+ ((hw->bus_width == e1000_bus_width_64) ? 64 : 32),
|
|
|
+ netdev->dev_addr);
|
|
|
|
|
|
/* carrier off reporting is important to ethtool even BEFORE open */
|
|
|
netif_carrier_off(netdev);
|