igb: Realign bad indentation
Statements should start on tabstops. Use a single statement and test instead of multiple tests. Signed-off-by: Joe Perches <joe@perches.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:
Родитель
c1878f7a89
Коммит
030ec9e682
|
@ -792,15 +792,13 @@ static s32 igb_set_default_fc(struct e1000_hw *hw)
|
||||||
* control setting, then the variable hw->fc will
|
* control setting, then the variable hw->fc will
|
||||||
* be initialized based on a value in the EEPROM.
|
* be initialized based on a value in the EEPROM.
|
||||||
*/
|
*/
|
||||||
if (hw->mac.type == e1000_i350) {
|
if (hw->mac.type == e1000_i350)
|
||||||
lan_offset = NVM_82580_LAN_FUNC_OFFSET(hw->bus.func);
|
lan_offset = NVM_82580_LAN_FUNC_OFFSET(hw->bus.func);
|
||||||
ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG
|
else
|
||||||
+ lan_offset, 1, &nvm_data);
|
lan_offset = 0;
|
||||||
} else {
|
|
||||||
ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG,
|
|
||||||
1, &nvm_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG + lan_offset,
|
||||||
|
1, &nvm_data);
|
||||||
if (ret_val) {
|
if (ret_val) {
|
||||||
hw_dbg("NVM Read Error\n");
|
hw_dbg("NVM Read Error\n");
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -808,8 +806,7 @@ static s32 igb_set_default_fc(struct e1000_hw *hw)
|
||||||
|
|
||||||
if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
|
if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
|
||||||
hw->fc.requested_mode = e1000_fc_none;
|
hw->fc.requested_mode = e1000_fc_none;
|
||||||
else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
|
else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR)
|
||||||
NVM_WORD0F_ASM_DIR)
|
|
||||||
hw->fc.requested_mode = e1000_fc_tx_pause;
|
hw->fc.requested_mode = e1000_fc_tx_pause;
|
||||||
else
|
else
|
||||||
hw->fc.requested_mode = e1000_fc_full;
|
hw->fc.requested_mode = e1000_fc_full;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче