Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 804c7515 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by David S. Miller
Browse files

be2net: Fix FW download in Lancer 



Increase time given by driver to adapter for completing FW download
to 30 seconds. Also return correct status when FW download times out.

Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fc16ebf

drivers/net/ethernet/emulex/benet/be_cmds.c

+3 −5
Original line number Diff line number Diff line
@@ -1824,18 +1824,16 @@ int lancer_cmd_write_object(struct be_adapter *adapter, struct be_dma_mem *cmd, 
	spin_unlock_bh(&adapter->mcc_lock);



	if (!wait_for_completion_timeout(&adapter->flash_compl,

			msecs_to_jiffies(12000)))

					 msecs_to_jiffies(30000)))

		status = -1;

	else

		status = adapter->flash_status;



	resp = embedded_payload(wrb);

	if (!status) {

	if (!status)

		*data_written = le32_to_cpu(resp->actual_write_len);

	} else {

	else

		*addn_status = resp->additional_status;

		status = resp->status;

	}



	return status;