Commit 8008b480 authored May 12, 2020 by Jérôme Pouiller Committed by Greg Kroah-Hartman May 13, 2020

staging: wfx: fix endianness of the field 'num_tx_confs'



The field 'num_tx_confs' from the struct hif_cnf_multi_transmit is a
__le32. Sparse complains this field is not always correctly accessed:

    drivers/staging/wfx/hif_rx.c:82:9: warning: restricted __le32 degrades to integer
    drivers/staging/wfx/hif_rx.c:87:29: warning: restricted __le32 degrades to integer

However, the value of num_tx_confs cannot be greater than 15. So, we
only have to access to the least significant byte. It is finally easier
to declare it as an array of bytes and only access to the first one.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200512150414.267198-16-Jerome.Pouiller@silabs.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ecda229e

drivers/staging/wfx/bh.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ static int rx_helper(struct wfx_dev wdev, size_t read_len, int is_cnf)
		if (!(hif->id & HIF_ID_IS_INDICATION)) {
		(*is_cnf)++;
		if (hif->id == HIF_CNF_ID_MULTI_TRANSMIT)
		release_count = le32_to_cpu(((struct hif_cnf_multi_transmit *)hif->body)->num_tx_confs);
		release_count = ((struct hif_cnf_multi_transmit *)hif->body)->num_tx_confs;
		else
		release_count = 1;
		WARN(wdev->hif.tx_buffers_used < release_count, "corrupted buffer counter");

drivers/staging/wfx/hif_api_cmd.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,8 @@ struct hif_cnf_tx {
		} __packed;

		struct hif_cnf_multi_transmit {
		__le32 num_tx_confs;
		u8 num_tx_confs;
		u8 reserved[3];
		struct hif_cnf_tx tx_conf_payload[];
		} __packed;

Admin message