ath9k: get rid of double queueing of rx frames on EDMA

Process rx status directly instead of separating the completion test from
the actual rx status processing.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 01d5c1a4d746..a66a13b76848 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -436,20 +436,14 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
         struct ar9003_rxs *rxsp = (struct ar9003_rxs *) buf_addr;
         unsigned int phyerr;
 
-        /* TODO: byte swap on big endian for ar9300_10 */
-
-        if (!rxs) {
-                if ((rxsp->status11 & AR_RxDone) == 0)
-                        return -EINPROGRESS;
-
-                if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
-                        return -EINVAL;
+        if ((rxsp->status11 & AR_RxDone) == 0)
+                return -EINPROGRESS;
 
-                if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
-                        return -EINPROGRESS;
+        if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
+                return -EINVAL;
 
-                return 0;
-        }
+        if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
+                return -EINPROGRESS;
 
         rxs->rs_status = 0;
         rxs->rs_flags =  0;