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

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

mwifiex: do not decrement rx_pending count twice 



This patch fixes an issue with rx processing function where we were
decrementing rx_pending count twice.

Patch also queues correct main_work item when rx_pending count reaches
low watermark.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f73e557b

drivers/net/wireless/mwifiex/main.c

+2 −6
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter) 
{

	unsigned long flags;

	struct sk_buff *skb;

	bool delay_main_work = adapter->delay_main_work;



	spin_lock_irqsave(&adapter->rx_proc_lock, flags);

	if (adapter->rx_processing || adapter->rx_locked) {
@@ -145,10 +144,9 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter) 
	while ((skb = skb_dequeue(&adapter->rx_data_q))) {

		atomic_dec(&adapter->rx_pending);

		if (adapter->delay_main_work &&

		    (atomic_dec_return(&adapter->rx_pending) <

		     LOW_RX_PENDING)) {

		    (atomic_read(&adapter->rx_pending) < LOW_RX_PENDING)) {

			adapter->delay_main_work = false;

			queue_work(adapter->rx_workqueue, &adapter->rx_work);

			queue_work(adapter->workqueue, &adapter->main_work);

		}

		mwifiex_handle_rx_packet(adapter, skb);

	}
@@ -156,8 +154,6 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter) 
	adapter->rx_processing = false;

	spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);



	if (delay_main_work)

		queue_work(adapter->workqueue, &adapter->main_work);

exit_rx_proc:

	return 0;

}