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
net/i40e: eliminate weak symbols in data path
[dpdk.git]
/
drivers
/
net
/
e1000
/
base
/
e1000_manage.c
diff --git
a/drivers/net/e1000/base/e1000_manage.c
b/drivers/net/e1000/base/e1000_manage.c
index
30db892
..
8564a7f
100644
(file)
--- a/
drivers/net/e1000/base/e1000_manage.c
+++ b/
drivers/net/e1000/base/e1000_manage.c
@@
-1,6
+1,6
@@
/*******************************************************************************
/*******************************************************************************
-Copyright (c) 2001-201
4
, Intel Corporation
+Copyright (c) 2001-201
5
, Intel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-363,9
+363,12
@@
bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
} else if ((hw->mac.type == e1000_82574) ||
(hw->mac.type == e1000_82583)) {
u16 data;
} else if ((hw->mac.type == e1000_82574) ||
(hw->mac.type == e1000_82583)) {
u16 data;
+ s32 ret_val;
factps = E1000_READ_REG(hw, E1000_FACTPS);
factps = E1000_READ_REG(hw, E1000_FACTPS);
- e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+ ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+ if (ret_val)
+ return false;
if (!(factps & E1000_FACTPS_MNGCG) &&
((data & E1000_NVM_INIT_CTRL2_MNGM) ==
if (!(factps & E1000_FACTPS_MNGCG) &&
((data & E1000_NVM_INIT_CTRL2_MNGM) ==