Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7837e58c authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

e1000: Fix message logging defect 



commit 675ad473
removed the capability to use ethtool.set_msglevel to
control the types of messages emitted by the driver.

That commit should probably be reverted.

If not, then this patch fixes a message logging defect
introduced by converting a printk without KERN_<level>
to e_info.

This also reduces text by about 200 bytes.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Tested-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d08935c2

drivers/net/e1000/e1000_main.c

+8 −9
Original line number Diff line number Diff line
@@ -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) ",

	e_info("(PCI%s:%dMHz:%d-bit) %pM\n",

	       ((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);

	       ((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);