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

Commit f3b369e4 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: rx path enhancement to derive priv only once 



We derive mwifiex_private structure which is per interface from
received skb's rx_info. Once priv is derived, same priv can be
propagated to other functions instead of callee deriving priv
from rx_info again.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3a5b8a16

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

+3 −5
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ mwifiex_11n_dispatch_pkt(struct mwifiex_private *priv, 
			if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

				mwifiex_handle_uap_rx_forward(priv, rx_tmp_ptr);

			else

				mwifiex_process_rx_packet(priv->adapter,

							  rx_tmp_ptr);

				mwifiex_process_rx_packet(priv, rx_tmp_ptr);

		}

	}
@@ -106,7 +105,7 @@ mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv, 
		if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

			mwifiex_handle_uap_rx_forward(priv, rx_tmp_ptr);

		else

			mwifiex_process_rx_packet(priv->adapter, rx_tmp_ptr);

			mwifiex_process_rx_packet(priv, rx_tmp_ptr);

	}



	spin_lock_irqsave(&priv->rx_pkt_lock, flags);
@@ -442,8 +441,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
			if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

				mwifiex_handle_uap_rx_forward(priv, payload);

			else

				mwifiex_process_rx_packet(priv->adapter,

							  payload);

				mwifiex_process_rx_packet(priv, payload);

		}

		return 0;

	}

drivers/net/wireless/mwifiex/main.h

+5 −5
Original line number Diff line number Diff line
@@ -747,9 +747,9 @@ int mwifiex_shutdown_fw_complete(struct mwifiex_adapter *adapter); 


int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);



int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb);

int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb);



int mwifiex_process_mgmt_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_mgmt_packet(struct mwifiex_private *priv,

				struct sk_buff *skb);



int mwifiex_process_event(struct mwifiex_adapter *adapter);
@@ -806,7 +806,7 @@ void mwifiex_hs_activated_event(struct mwifiex_private *priv, 
					u8 activated);

int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,

			      struct host_cmd_ds_command *resp);

int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_rx_packet(struct mwifiex_private *priv,

			      struct sk_buff *skb);

int mwifiex_sta_prepare_cmd(struct mwifiex_private *, uint16_t cmd_no,

			    u16 cmd_action, u32 cmd_oid,
@@ -816,9 +816,9 @@ int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no, 
			    void *data_buf, void *cmd_buf);

int mwifiex_process_sta_cmdresp(struct mwifiex_private *, u16 cmdresp_no,

				struct host_cmd_ds_command *resp);

int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *,

int mwifiex_process_sta_rx_packet(struct mwifiex_private *,

				  struct sk_buff *skb);

int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,

				  struct sk_buff *skb);

int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv,

				  struct sk_buff *skb);

drivers/net/wireless/mwifiex/sta_rx.c

+8 −18
Original line number Diff line number Diff line
@@ -38,14 +38,10 @@ 
 *

 * The completion callback is called after processing in complete.

 */

int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_rx_packet(struct mwifiex_private *priv,

			      struct sk_buff *skb)

{

	int ret;

	struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);

	struct mwifiex_private *priv =

			mwifiex_get_priv_by_id(adapter, rx_info->bss_num,

					       rx_info->bss_type);

	struct rx_packet_hdr *rx_pkt_hdr;

	struct rxpd *local_rx_pd;

	int hdr_chop;
@@ -98,9 +94,9 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, 


	priv->rxpd_htinfo = local_rx_pd->ht_info;



	ret = mwifiex_recv_packet(adapter, skb);

	ret = mwifiex_recv_packet(priv, skb);

	if (ret == -1)

		dev_err(adapter->dev, "recv packet failed\n");

		dev_err(priv->adapter->dev, "recv packet failed\n");



	return ret;

}
@@ -117,21 +113,15 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, 
 *

 * The completion callback is called after processing in complete.

 */

int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv,

				  struct sk_buff *skb)

{

	struct mwifiex_adapter *adapter = priv->adapter;

	int ret = 0;

	struct rxpd *local_rx_pd;

	struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);

	struct rx_packet_hdr *rx_pkt_hdr;

	u8 ta[ETH_ALEN];

	u16 rx_pkt_type, rx_pkt_offset, rx_pkt_length, seq_num;

	struct mwifiex_private *priv =

			mwifiex_get_priv_by_id(adapter, rx_info->bss_num,

					       rx_info->bss_type);



	if (!priv)

		return -1;



	local_rx_pd = (struct rxpd *) (skb->data);

	rx_pkt_type = le16_to_cpu(local_rx_pd->rx_pkt_type);
@@ -169,13 +159,13 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter, 


		while (!skb_queue_empty(&list)) {

			rx_skb = __skb_dequeue(&list);

			ret = mwifiex_recv_packet(adapter, rx_skb);

			ret = mwifiex_recv_packet(priv, rx_skb);

			if (ret == -1)

				dev_err(adapter->dev, "Rx of A-MSDU failed");

		}

		return 0;

	} else if (rx_pkt_type == PKT_TYPE_MGMT) {

		ret = mwifiex_process_mgmt_packet(adapter, skb);

		ret = mwifiex_process_mgmt_packet(priv, skb);

		if (ret)

			dev_err(adapter->dev, "Rx of mgmt packet failed");

		dev_kfree_skb_any(skb);
@@ -188,7 +178,7 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter, 
	 */

	if (!IS_11N_ENABLED(priv) ||

	    memcmp(priv->curr_addr, rx_pkt_hdr->eth803_hdr.h_dest, ETH_ALEN)) {

		mwifiex_process_rx_packet(adapter, skb);

		mwifiex_process_rx_packet(priv, skb);

		return ret;

	}

drivers/net/wireless/mwifiex/txrx.c

+8 −2
Original line number Diff line number Diff line
@@ -48,13 +48,19 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, 
	if (!priv)

		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);



	if (!priv) {

		dev_err(adapter->dev, "data: priv not found. Drop RX packet\n");

		dev_kfree_skb_any(skb);

		return -1;

	}



	rx_info->bss_num = priv->bss_num;

	rx_info->bss_type = priv->bss_type;



	if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

		return mwifiex_process_uap_rx_packet(adapter, skb);

		return mwifiex_process_uap_rx_packet(priv, skb);



	return mwifiex_process_sta_rx_packet(adapter, skb);

	return mwifiex_process_sta_rx_packet(priv, skb);

}

EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);

drivers/net/wireless/mwifiex/uap_txrx.c

+5 −12
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv, 
	}



	/* Forward unicat/Inter-BSS packets to kernel. */

	return mwifiex_process_rx_packet(adapter, skb);

	return mwifiex_process_rx_packet(priv, skb);

}



/*
@@ -159,24 +159,17 @@ int mwifiex_handle_uap_rx_forward(struct mwifiex_private *priv, 
 *

 * The completion callback is called after processing is complete.

 */

int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter,

int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,

				  struct sk_buff *skb)

{

	struct mwifiex_adapter *adapter = priv->adapter;

	int ret;

	struct uap_rxpd *uap_rx_pd;

	struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);

	struct rx_packet_hdr *rx_pkt_hdr;

	u16 rx_pkt_type;

	u8 ta[ETH_ALEN], pkt_type;

	struct mwifiex_sta_node *node;



	struct mwifiex_private *priv =

			mwifiex_get_priv_by_id(adapter, rx_info->bss_num,

					       rx_info->bss_type);



	if (!priv)

		return -1;



	uap_rx_pd = (struct uap_rxpd *)(skb->data);

	rx_pkt_type = le16_to_cpu(uap_rx_pd->rx_pkt_type);

	rx_pkt_hdr = (void *)uap_rx_pd + le16_to_cpu(uap_rx_pd->rx_pkt_offset);
@@ -210,7 +203,7 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter, 


		while (!skb_queue_empty(&list)) {

			rx_skb = __skb_dequeue(&list);

			ret = mwifiex_recv_packet(adapter, rx_skb);

			ret = mwifiex_recv_packet(priv, rx_skb);

			if (ret)

				dev_err(adapter->dev,

					"AP:Rx A-MSDU failed");
@@ -218,7 +211,7 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter, 


		return 0;

	} else if (rx_pkt_type == PKT_TYPE_MGMT) {

		ret = mwifiex_process_mgmt_packet(adapter, skb);

		ret = mwifiex_process_mgmt_packet(priv, skb);

		if (ret)

			dev_err(adapter->dev, "Rx of mgmt packet failed");

		dev_kfree_skb_any(skb);