git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common/dpaax: fallback to check separate memory node for VM
[dpdk.git]
/
drivers
/
net
/
ixgbe
/
base
/
ixgbe_common.c
diff --git
a/drivers/net/ixgbe/base/ixgbe_common.c
b/drivers/net/ixgbe/base/ixgbe_common.c
index
b4a0d70
..
62ff767
100644
(file)
--- a/
drivers/net/ixgbe/base/ixgbe_common.c
+++ b/
drivers/net/ixgbe/base/ixgbe_common.c
@@
-5040,7
+5040,7
@@
void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,
hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);
/* Return is offset to OEM Product Version block is invalid */
hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);
/* Return is offset to OEM Product Version block is invalid */
- if (offset == 0x0
&&
offset == NVM_INVALID_PTR)
+ if (offset == 0x0
||
offset == NVM_INVALID_PTR)
return;
/* Read product version block */
return;
/* Read product version block */
@@
-5259,10
+5259,10
@@
s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
ixgbe_flap_tx_laser(hw);
/* Wait for the controller to acquire link. Per IEEE 802.3ap,
ixgbe_flap_tx_laser(hw);
/* Wait for the controller to acquire link. Per IEEE 802.3ap,
- * Section 73.10.2, we may have to wait up to
5
00ms if KR is
+ * Section 73.10.2, we may have to wait up to
10
00ms if KR is
* attempted. 82599 uses the same timing for 10g SFI.
*/
* attempted. 82599 uses the same timing for 10g SFI.
*/
- for (i = 0; i <
5
; i++) {
+ for (i = 0; i <
10
; i++) {
/* Wait for the link partner to also set speed */
msec_delay(100);
/* Wait for the link partner to also set speed */
msec_delay(100);