Merge branch 'ath-current' into ath-next

Commit 3c97f5de1f28 ("ath10k: implement NAPI support") conflicts with
ath-current. To avoid any merge problems merge ath-current to ath-next already now.

Conflicts:
	drivers/net/wireless/ath/ath10k/htt_rx.c

diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c
index 2067ac2,24c8d65..714b0de
--- 1/drivers/net/wireless/ath/ath10k/htt_rx.c
--- 2/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@@ -1520,9 -1525,9 +1520,9 @@@ static void ath10k_htt_rx_h_filter(stru
  static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
  {
        struct ath10k *ar = htt->ar;
-       static struct ieee80211_rx_status rx_status;
+       struct ieee80211_rx_status *rx_status = &htt->rx_status;
        struct sk_buff_head amsdu;
 -      int ret;
 +      int ret, num_msdus;
  
        __skb_queue_head_init(&amsdu);
  
@@@ -1544,14 -1549,13 +1544,14 @@@
                return ret;
        }
  
-       ath10k_htt_rx_h_ppdu(ar, &amsdu, &rx_status, 0xffff);
 +      num_msdus = skb_queue_len(&amsdu);
+       ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);
        ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);
-       ath10k_htt_rx_h_filter(ar, &amsdu, &rx_status);
-       ath10k_htt_rx_h_mpdu(ar, &amsdu, &rx_status);
-       ath10k_htt_rx_h_deliver(ar, &amsdu, &rx_status);
+       ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
+       ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
+       ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
  
 -      return 0;
 +      return num_msdus;
  }
  
  static void ath10k_htt_rx_proc_rx_ind(struct ath10k_htt *htt,

diff --cc drivers/net/wireless/ath/ath10k/pci.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge