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

Commit 1b1bf31a authored Jul 31, 2013 by Don Skidmore Committed by Jeff Kirsher Aug 29, 2013

ixgbe: cleanup some log messages

Some minor log messages cleanup, changing the level one message is logged,
adding a bit of detail to another and put all the text on one line.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent b08e1ed9

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -7605,10 +7605,8 @@ static int ixgbe_probe(struct pci_dev pdev, const struct pci_device_id ent)
		hw->mac.type == ixgbe_mac_82598EB) {
		err = 0;
		} else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
		e_dev_err("failed to load because an unsupported SFP+ "
		"module type was detected.\n");
		e_dev_err("Reload the driver after installing a supported "
		"module.\n");
		e_dev_err("failed to load because an unsupported SFP+ or QSFP module type was detected.\n");
		e_dev_err("Reload the driver after installing a supported module.\n");
		goto err_sw_init;
		} else if (err) {
		e_dev_err("HW Init failed: %d\n", err);

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1282,7 +1282,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
		status = 0;
		} else {
		if (hw->allow_unsupported_sfp == true) {
		e_warn(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
		e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
		status = 0;
		} else {
		hw_dbg(hw,