Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
intel
/
e1000
/
e1000_hw.c
diff --git
a/kernel/drivers/net/ethernet/intel/e1000/e1000_hw.c
b/kernel/drivers/net/ethernet/intel/e1000/e1000_hw.c
index
45c8c86
..
b1af0d6
100644
(file)
--- a/
kernel/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/
kernel/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@
-3900,10
+3900,6
@@
static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
return E1000_SUCCESS;
}
return E1000_SUCCESS;
}
- /* If eeprom is not yet detected, do so now */
- if (eeprom->word_size == 0)
- e1000_init_eeprom_params(hw);
-
/* A check for invalid values: offset too large, too many words, and
* not enough words.
*/
/* A check for invalid values: offset too large, too many words, and
* not enough words.
*/
@@
-4074,10
+4070,6
@@
static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
return E1000_SUCCESS;
}
return E1000_SUCCESS;
}
- /* If eeprom is not yet detected, do so now */
- if (eeprom->word_size == 0)
- e1000_init_eeprom_params(hw);
-
/* A check for invalid values: offset too large, too many words, and
* not enough words.
*/
/* A check for invalid values: offset too large, too many words, and
* not enough words.
*/