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

Commit 78776467 authored by Ganapathi Bhat's avatar Ganapathi Bhat Committed by Kalle Valo
Browse files

mwifiex: Command 7 handling for USB chipsets 



Firmware image for newer USB chipsets starts with a command 7 block
(special command). It doesn't contain data length field. This patch adds
necessary handling.

Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d86e6476

drivers/net/wireless/marvell/mwifiex/usb.c

+4 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,10 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter, 
			dnld_cmd = le32_to_cpu(fwdata->fw_hdr.dnld_cmd);

			tlen += sizeof(struct fw_header);



			/* Command 7 doesn't have data length field */

			if (dnld_cmd == FW_CMD_7)

				dlen = 0;



			memcpy(fwdata->data, &firmware[tlen], dlen);



			fwdata->seq_num = cpu_to_le32(fw_seqnum);

drivers/net/wireless/marvell/mwifiex/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define FW_DNLD_TX_BUF_SIZE	620

#define FW_DNLD_RX_BUF_SIZE	2048

#define FW_HAS_LAST_BLOCK	0x00000004

#define FW_CMD_7		0x00000007



#define FW_DATA_XMIT_SIZE \

	(sizeof(struct fw_header) + dlen + sizeof(u32))