evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

igb: random code and comments fix

Browse source 
This patch fixes code and comments as identified in the driver.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Akeem G. Abodunrin 2013-01-29 10:15:31 +00:00 • committed by Jeff Kirsher
parent e00bf607ea
commit 5c17a20372
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/intel/igb/e1000_i210.c
View file

@ -326,7 +326,7 @@ s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,
/** /**
* igb_read_nvm_i211 - Read NVM wrapper function for I211 * igb_read_nvm_i211 - Read NVM wrapper function for I211
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @address: the word address (aka eeprom offset) to read * @words: number of words to read
* @data: pointer to the data read * @data: pointer to the data read
* *
* Wrapper function to return data formerly found in the NVM. * Wrapper function to return data formerly found in the NVM.

6
drivers/net/ethernet/intel/igb/e1000_mac.c
View file

@ -1007,9 +1007,9 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
* be asked to delay transmission of packets than asking * be asked to delay transmission of packets than asking
* our link partner to pause transmission of frames. * our link partner to pause transmission of frames.
*/ */
else if ((hw->fc.requested_mode == e1000_fc_none || else if ((hw->fc.requested_mode == e1000_fc_none) ||
hw->fc.requested_mode == e1000_fc_tx_pause) || (hw->fc.requested_mode == e1000_fc_tx_pause) ||
hw->fc.strict_ieee) { (hw->fc.strict_ieee)) {
hw->fc.current_mode = e1000_fc_none; hw->fc.current_mode = e1000_fc_none;
hw_dbg("Flow Control = NONE.\r\n"); hw_dbg("Flow Control = NONE.\r\n");
} else { } else {

3
drivers/net/ethernet/intel/igb/igb_main.c
View file

@ -3859,9 +3859,8 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
ctrl_ext = rd32(E1000_CTRL_EXT); ctrl_ext = rd32(E1000_CTRL_EXT);
if ((hw->phy.media_type == e1000_media_type_copper) && if ((hw->phy.media_type == e1000_media_type_copper) &&
!(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) { !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII))
ret = !!(thstat & event); ret = !!(thstat & event);
}
} }
return ret; return ret;