| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Tue, 9 May 2017 17:19:42 +0100 |
| Subject: netxen_nic: set rcode to the return status from the call to netxen_issue_cmd |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| |
| [ Upstream commit 0fe20fafd1791f993806d417048213ec57b81045 ] |
| |
| Currently rcode is being initialized to NX_RCODE_SUCCESS and later it |
| is checked to see if it is not NX_RCODE_SUCCESS which is never true. It |
| appears that there is an unintentional missing assignment of rcode from |
| the return of the call to netxen_issue_cmd() that was dropped in |
| an earlier fix, so add it in. |
| |
| Detected by CoverityScan, CID#401900 ("Logically dead code") |
| |
| Fixes: 2dcd5d95ad6b2 ("netxen_nic: fix cdrp race condition") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c |
| +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c |
| @@ -247,7 +247,7 @@ nx_fw_cmd_set_mtu(struct netxen_adapter |
| cmd.req.arg3 = 0; |
| |
| if (recv_ctx->state == NX_HOST_CTX_STATE_ACTIVE) |
| - netxen_issue_cmd(adapter, &cmd); |
| + rcode = netxen_issue_cmd(adapter, &cmd); |
| |
| if (rcode != NX_RCODE_SUCCESS) |
| return -EIO; |
