From: Avinash Patil <patila@marvell.com>
Date: Mon, 29 Sep 2014 16:14:14 +0000 (+0530)
Subject: mwifiex: do not decrement rx_pending count twice
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b43a0d9d01dbe498632e83632a2409a575fcee23;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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: Avinash Patil <patila@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index be5218987101..d5070c444fe1 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -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;
 }