Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Imported Upstream version 17.05
[deb_dpdk.git]
/
drivers
/
net
/
fm10k
/
base
/
fm10k_mbx.c
diff --git
a/drivers/net/fm10k/base/fm10k_mbx.c
b/drivers/net/fm10k/base/fm10k_mbx.c
index
2e70434
..
16ab98d
100644
(file)
--- a/
drivers/net/fm10k/base/fm10k_mbx.c
+++ b/
drivers/net/fm10k/base/fm10k_mbx.c
@@
-2066,9
+2066,10
@@
STATIC void fm10k_sm_mbx_create_reply(struct fm10k_hw *hw,
* function can also be used to respond to an error as the connection
* resetting would also be a means of dealing with errors.
**/
* function can also be used to respond to an error as the connection
* resetting would also be a means of dealing with errors.
**/
-STATIC
void
fm10k_sm_mbx_process_reset(struct fm10k_hw *hw,
-
struct fm10k_mbx_info *mbx)
+STATIC
s32
fm10k_sm_mbx_process_reset(struct fm10k_hw *hw,
+ struct fm10k_mbx_info *mbx)
{
{
+ s32 err = FM10K_SUCCESS;
const enum fm10k_mbx_state state = mbx->state;
switch (state) {
const enum fm10k_mbx_state state = mbx->state;
switch (state) {
@@
-2081,6
+2082,7
@@
STATIC void fm10k_sm_mbx_process_reset(struct fm10k_hw *hw,
case FM10K_STATE_OPEN:
/* flush any incomplete work */
fm10k_sm_mbx_connect_reset(mbx);
case FM10K_STATE_OPEN:
/* flush any incomplete work */
fm10k_sm_mbx_connect_reset(mbx);
+ err = FM10K_ERR_RESET_REQUESTED;
break;
case FM10K_STATE_CONNECT:
/* Update remote value to match local value */
break;
case FM10K_STATE_CONNECT:
/* Update remote value to match local value */
@@
-2090,6
+2092,8
@@
STATIC void fm10k_sm_mbx_process_reset(struct fm10k_hw *hw,
}
fm10k_sm_mbx_create_reply(hw, mbx, mbx->tail);
}
fm10k_sm_mbx_create_reply(hw, mbx, mbx->tail);
+
+ return err;
}
/**
}
/**
@@
-2172,7
+2176,7
@@
STATIC s32 fm10k_sm_mbx_process(struct fm10k_hw *hw,
switch (FM10K_MSG_HDR_FIELD_GET(mbx->mbx_hdr, SM_VER)) {
case 0:
switch (FM10K_MSG_HDR_FIELD_GET(mbx->mbx_hdr, SM_VER)) {
case 0:
- fm10k_sm_mbx_process_reset(hw, mbx);
+
err =
fm10k_sm_mbx_process_reset(hw, mbx);
break;
case FM10K_SM_MBX_VERSION:
err = fm10k_sm_mbx_process_version_1(hw, mbx);
break;
case FM10K_SM_MBX_VERSION:
err = fm10k_sm_mbx_process_version_1(hw, mbx);