Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

[cascardo/linux.git] / drivers / net / wireless / ath / ath10k / htt_rx.c

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 813cdd2..80e6453 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -748,7 +748,7 @@ ath10k_htt_rx_h_peer_channel(struct ath10k *ar, struct htt_rx_desc *rxd)
        if (WARN_ON_ONCE(!arvif))
                return NULL;
 
-       if (WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def)))
+       if (WARN_ON_ONCE(ath10k_mac_vif_chan(arvif->vif, &def)))
                return NULL;
 
        return def.chan;
@@ -939,7 +939,8 @@ static void ath10k_process_rx(struct ath10k *ar,
                   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?
                                                        "mcast" : "ucast",
                   (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4,
-                  status->flag == 0 ? "legacy" : "",
+                  (status->flag & (RX_FLAG_HT | RX_FLAG_VHT)) == 0 ?
+                                                       "legacy" : "",
                   status->flag & RX_FLAG_HT ? "ht" : "",
                   status->flag & RX_FLAG_VHT ? "vht" : "",
                   status->flag & RX_FLAG_40MHZ ? "40" : "",
@@ -2181,34 +2182,6 @@ static void ath10k_htt_rx_tx_mode_switch_ind(struct ath10k *ar,
        ath10k_mac_tx_push_pending(ar);
 }
 
-static inline enum nl80211_band phy_mode_to_band(u32 phy_mode)
-{
-       enum nl80211_band band;
-
-       switch (phy_mode) {
-       case MODE_11A:
-       case MODE_11NA_HT20:
-       case MODE_11NA_HT40:
-       case MODE_11AC_VHT20:
-       case MODE_11AC_VHT40:
-       case MODE_11AC_VHT80:
-               band = NL80211_BAND_5GHZ;
-               break;
-       case MODE_11G:
-       case MODE_11B:
-       case MODE_11GONLY:
-       case MODE_11NG_HT20:
-       case MODE_11NG_HT40:
-       case MODE_11AC_VHT20_2G:
-       case MODE_11AC_VHT40_2G:
-       case MODE_11AC_VHT80_2G:
-       default:
-               band = NL80211_BAND_2GHZ;
-       }
-
-       return band;
-}
-
 void ath10k_htt_htc_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
 {
        bool release;
@@ -2290,7 +2263,6 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                        ath10k_htt_tx_mgmt_dec_pending(htt);
                        spin_unlock_bh(&htt->tx_lock);
                }
-               ath10k_mac_tx_push_pending(ar);
                break;
        }
        case HTT_T2H_MSG_TYPE_TX_COMPL_IND:
@@ -2441,8 +2413,6 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr)
                dev_kfree_skb_any(skb);
        }
 
-       ath10k_mac_tx_push_pending(ar);
-
        num_mpdus = atomic_read(&htt->num_mpdus_ready);
 
        while (num_mpdus) {