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

Commit ca8d6dfc authored by Ujjal Roy's avatar Ujjal Roy Committed by John W. Linville
Browse files

mwifiex: fix rx_pending count imbalance 



RX packets are handled in different paths. Not all paths have
decrement of rx_pending counter. This patch fixes the counter
imbalance.

Signed-off-by: default avatarUjjal Roy <royujjal@gmail.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f8eb5ee5

drivers/net/wireless/mwifiex/init.c

+2 −1
Original line number Diff line number Diff line
@@ -643,7 +643,8 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) 
			if (priv)

				priv->stats.rx_dropped++;



			adapter->if_ops.data_complete(adapter, skb);

			dev_kfree_skb_any(skb);

			adapter->if_ops.data_complete(adapter);

		}

	}

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ struct mwifiex_if_ops { 
	void (*cleanup_mpa_buf) (struct mwifiex_adapter *);

	int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);

	int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);

	int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);

	int (*data_complete) (struct mwifiex_adapter *);

	int (*init_fw_port) (struct mwifiex_adapter *);

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

	void (*card_reset) (struct mwifiex_adapter *);

drivers/net/wireless/mwifiex/sta_rx.c

+3 −12
Original line number Diff line number Diff line
@@ -188,12 +188,7 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv, 
			"wrong rx packet: len=%d, rx_pkt_offset=%d, rx_pkt_length=%d\n",

			skb->len, rx_pkt_offset, rx_pkt_length);

		priv->stats.rx_dropped++;



		if (adapter->if_ops.data_complete)

			adapter->if_ops.data_complete(adapter, skb);

		else

		dev_kfree_skb_any(skb);



		return ret;

	}
@@ -247,12 +242,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv, 
	ret = mwifiex_11n_rx_reorder_pkt(priv, seq_num, local_rx_pd->priority,

					 ta, (u8) rx_pkt_type, skb);



	if (ret || (rx_pkt_type == PKT_TYPE_BAR)) {

		if (adapter->if_ops.data_complete)

			adapter->if_ops.data_complete(adapter, skb);

		else

	if (ret || (rx_pkt_type == PKT_TYPE_BAR))

		dev_kfree_skb_any(skb);

	}



	if (ret)

		priv->stats.rx_dropped++;

drivers/net/wireless/mwifiex/txrx.c

+9 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, 
		mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

	struct rxpd *local_rx_pd;

	struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);

	int ret;



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

	/* Get the BSS number from rxpd, get corresponding priv */
@@ -58,9 +59,15 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, 
	rx_info->bss_type = priv->bss_type;



	if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)

		return mwifiex_process_uap_rx_packet(priv, skb);

		ret = mwifiex_process_uap_rx_packet(priv, skb);

	else

		ret = mwifiex_process_sta_rx_packet(priv, skb);



	/* Decrement RX pending counter for each packet */

	if (adapter->if_ops.data_complete)

		adapter->if_ops.data_complete(adapter);



	return mwifiex_process_sta_rx_packet(priv, skb);

	return ret;

}

EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);

drivers/net/wireless/mwifiex/uap_txrx.c

+3 −12
Original line number Diff line number Diff line
@@ -267,12 +267,7 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv, 
			skb->len, le16_to_cpu(uap_rx_pd->rx_pkt_offset),

			le16_to_cpu(uap_rx_pd->rx_pkt_length));

		priv->stats.rx_dropped++;



		if (adapter->if_ops.data_complete)

			adapter->if_ops.data_complete(adapter, skb);

		else

		dev_kfree_skb_any(skb);



		return 0;

	}
@@ -326,12 +321,8 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv, 
					 uap_rx_pd->priority, ta, pkt_type,

					 skb);



	if (ret || (rx_pkt_type == PKT_TYPE_BAR)) {

		if (adapter->if_ops.data_complete)

			adapter->if_ops.data_complete(adapter, skb);

		else

	if (ret || (rx_pkt_type == PKT_TYPE_BAR))

		dev_kfree_skb_any(skb);

	}



	if (ret)

		priv->stats.rx_dropped++;