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

Commit cfcd926e authored by Tobias Waldekranz's avatar Tobias Waldekranz Committed by John W. Linville
Browse files

mwifiex: add missing endian conversions 



Fixes multiple locations where a little endian host is assumed during
ser/des of messages sent to/received from the chip.

Signed-off-by: default avatarTobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d4c04ba1

drivers/net/wireless/mwifiex/11n_aggr.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ mwifiex_11n_form_amsdu_pkt(struct sk_buff *skb_aggr, 
	memcpy(&tx_header->eth803_hdr, skb_src->data, dt_offset);



	/* Copy SNAP header */

	snap.snap_type = *(u16 *) ((u8 *)skb_src->data + dt_offset);

	snap.snap_type = le16_to_cpu(*(__le16 *) ((u8 *)skb_src->data + dt_offset));

	dt_offset += sizeof(u16);



	memcpy(&tx_header->rfc1042_hdr, &snap, sizeof(struct rfc_1042_hdr));

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ mwifiex_netdev_get_priv(struct net_device *dev) 
 */

static inline bool mwifiex_is_skb_mgmt_frame(struct sk_buff *skb)

{

	return (*(u32 *)skb->data == PKT_TYPE_MGMT);

	return (le32_to_cpu(*(__le32 *)skb->data) == PKT_TYPE_MGMT);

}



/* This function retrieves channel closed for operation by Channel

drivers/net/wireless/mwifiex/sdio.c

+3 −3
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, 


	case MWIFIEX_TYPE_EVENT:

		dev_dbg(adapter->dev, "info: --- Rx: Event ---\n");

		adapter->event_cause = *(u32 *) skb->data;

		adapter->event_cause = le32_to_cpu(*(__le32 *) skb->data);



		if ((skb->len > 0) && (skb->len  < MAX_EVENT_SIZE))

			memcpy(adapter->event_body,
@@ -1207,8 +1207,8 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter, 
		for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {



			/* get curr PKT len & type */

			pkt_len = *(u16 *) &curr_ptr[0];

			pkt_type = *(u16 *) &curr_ptr[2];

			pkt_len = le16_to_cpu(*(__le16 *) &curr_ptr[0]);

			pkt_type = le16_to_cpu(*(__le16 *) &curr_ptr[2]);



			/* copy pkt to deaggr buf */

			skb_deaggr = card->mpa_rx.skb_arr[pind];

drivers/net/wireless/mwifiex/sta_cmdresp.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv, 


	tlv_buf = ((u8 *)rate_cfg) +

			sizeof(struct host_cmd_ds_tx_rate_cfg);

	tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));

	tlv_buf_len = le16_to_cpu(*(__le16 *) (tlv_buf + sizeof(u16)));



	while (tlv_buf && tlv_buf_len > 0) {

		tlv = (*tlv_buf);