Commit efea95d4 authored Feb 17, 2016 by Doron Shikmoni Committed by Jeff Kirsher Apr 06, 2016

igb: Garbled output for "ethtool -m"



Garbled output for "ethtool -m ethX", in igb-driven NICs with module /
plugin EEPROM (i.e. SFP information). Each output data byte appears
duplicated.

In igb_ethtool.c, igb_get_module_eeprom() is reading the EEPROM via i2c;
the eeprom offset for each word that's read via igb_read_phy_reg_i2c()
was passed in #words, whereas it needs to be a byte offset.
This patches fixes the bug.

Signed-off-by: Doron Shikmoni <doron.shikmoni@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 806ffb1d

drivers/net/ethernet/intel/igb/igb_ethtool.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2831,7 +2831,8 @@ static int igb_get_module_eeprom(struct net_device *netdev,

		/* Read EEPROM block, SFF-8079/SFF-8472, word at a time */
		for (i = 0; i < last_word - first_word + 1; i++) {
		status = igb_read_phy_reg_i2c(hw, first_word + i, &dataword[i]);
		status = igb_read_phy_reg_i2c(hw, (first_word + i) * 2,
		&dataword[i]);
		if (status) {
		/* Error occurred while reading module */
		kfree(dataword);