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

Commit f4c5d599 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: use variable interface header length 



Usb tx aggregation feature will utilize 4-bytes bus interface header,
otherwise it will be set to zero in default case.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 98f44cb0

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
	int pad = 0, aggr_num = 0, ret;

	struct mwifiex_tx_param tx_param;

	struct txpd *ptx_pd = NULL;

	int headroom = adapter->iface_type == MWIFIEX_USB ? 0 : INTF_HEADER_LEN;

	int headroom = adapter->intf_hdr_len;



	skb_src = skb_peek(&pra_list->skb_head);

	if (!skb_src) {

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

+4 −4
Original line number Diff line number Diff line
@@ -258,10 +258,10 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv, 
		if (ret == -EBUSY)

			cmd_node->cmd_skb = NULL;

	} else {

		skb_push(cmd_node->cmd_skb, INTF_HEADER_LEN);

		skb_push(cmd_node->cmd_skb, adapter->intf_hdr_len);

		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,

						   cmd_node->cmd_skb, NULL);

		skb_pull(cmd_node->cmd_skb, INTF_HEADER_LEN);

		skb_pull(cmd_node->cmd_skb, adapter->intf_hdr_len);

	}



	if (ret == -1) {
@@ -351,10 +351,10 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter) 
		if (ret != -EBUSY)

			dev_kfree_skb_any(sleep_cfm_tmp);

	} else {

		skb_push(adapter->sleep_cfm, INTF_HEADER_LEN);

		skb_push(adapter->sleep_cfm, adapter->intf_hdr_len);

		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,

						   adapter->sleep_cfm, NULL);

		skb_pull(adapter->sleep_cfm, INTF_HEADER_LEN);

		skb_pull(adapter->sleep_cfm, adapter->intf_hdr_len);

	}



	if (ret == -1) {

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

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) 
	else

		adapter->data_sent = false;



	if (adapter->iface_type == MWIFIEX_USB)

		adapter->intf_hdr_len = 0;

	else

		adapter->intf_hdr_len = INTF_HEADER_LEN;



	adapter->cmd_resp_received = false;

	adapter->event_received = false;

	adapter->data_received = false;

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

+1 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ struct mwifiex_adapter { 
	u8 perm_addr[ETH_ALEN];

	bool surprise_removed;

	u32 fw_release_number;

	u8 intf_hdr_len;

	u16 init_wait_q_woken;

	wait_queue_head_t init_wait_q;

	void *card;

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

+10 −9
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) 
		 * first 2 bytes for len, next 2 bytes is for type

		 */

		rx_len = get_unaligned_le16(skb_data->data);

		if (WARN_ON(rx_len <= INTF_HEADER_LEN ||

		if (WARN_ON(rx_len <= adapter->intf_hdr_len ||

			    rx_len > MWIFIEX_RX_DATA_BUF_SIZE)) {

			mwifiex_dbg(adapter, ERROR,

				    "Invalid RX len %d, Rd=%#x, Wr=%#x\n",
@@ -1400,7 +1400,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) 
			mwifiex_dbg(adapter, DATA,

				    "info: RECV DATA: Rd=%#x, Wr=%#x, Len=%d\n",

				    card->rxbd_rdptr, wrptr, rx_len);

			skb_pull(skb_data, INTF_HEADER_LEN);

			skb_pull(skb_data, adapter->intf_hdr_len);

			if (adapter->rx_work_enabled) {

				skb_queue_tail(&adapter->rx_data_q, skb_data);

				adapter->data_received = true;
@@ -1734,7 +1734,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) 
						       MWIFIEX_MAX_DELAY_COUNT);

			mwifiex_unmap_pci_memory(adapter, skb,

						 PCI_DMA_FROMDEVICE);

			skb_pull(skb, INTF_HEADER_LEN);

			skb_pull(skb, adapter->intf_hdr_len);

			while (reg->sleep_cookie && (count++ < 10) &&

			       mwifiex_pcie_ok_to_access_hw(adapter))

				usleep_range(50, 60);
@@ -1747,12 +1747,12 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) 
		}

		memcpy(adapter->upld_buf, skb->data,

		       min_t(u32, MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len));

		skb_push(skb, INTF_HEADER_LEN);

		skb_push(skb, adapter->intf_hdr_len);

		if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,

					   PCI_DMA_FROMDEVICE))

			return -1;

	} else if (mwifiex_pcie_ok_to_access_hw(adapter)) {

		skb_pull(skb, INTF_HEADER_LEN);

		skb_pull(skb, adapter->intf_hdr_len);

		adapter->curr_cmd->resp_skb = skb;

		adapter->cmd_resp_received = true;

		/* Take the pointer and set it to CMD node and will
@@ -1789,7 +1789,7 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter, 


	if (skb) {

		card->cmdrsp_buf = skb;

		skb_push(card->cmdrsp_buf, INTF_HEADER_LEN);

		skb_push(card->cmdrsp_buf, adapter->intf_hdr_len);

		if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,

					   PCI_DMA_FROMDEVICE))

			return -1;
@@ -1854,14 +1854,15 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter) 
		desc = card->evtbd_ring[rdptr];

		memset(desc, 0, sizeof(*desc));



		event = get_unaligned_le32(&skb_cmd->data[INTF_HEADER_LEN]);

		event = get_unaligned_le32(

			&skb_cmd->data[adapter->intf_hdr_len]);

		adapter->event_cause = event;

		/* The first 4bytes will be the event transfer header

		   len is 2 bytes followed by type which is 2 bytes */

		memcpy(&data_len, skb_cmd->data, sizeof(__le16));

		evt_len = le16_to_cpu(data_len);

		skb_trim(skb_cmd, evt_len);

		skb_pull(skb_cmd, INTF_HEADER_LEN);

		skb_pull(skb_cmd, adapter->intf_hdr_len);

		mwifiex_dbg(adapter, EVENT,

			    "info: Event length: %d\n", evt_len);
@@ -1920,7 +1921,7 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter, 
	}



	if (!card->evt_buf_list[rdptr]) {

		skb_push(skb, INTF_HEADER_LEN);

		skb_push(skb, adapter->intf_hdr_len);

		skb_put(skb, MAX_EVENT_SIZE - skb->len);

		if (mwifiex_map_pci_memory(adapter, skb,

					   MAX_EVENT_SIZE,