iwlwifi: move queue mapping out of transport

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / iwl-mac80211.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index d2be4b60488da1698d4e8418e4b73167ca816d3d..1bd021a24a8abdc5419f6f8d3a409198cef62c13 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -654,6 +654,8 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                ret = iwl_sta_rx_agg_stop(priv, sta, tid);
                break;
        case IEEE80211_AMPDU_TX_START:
+               if (!trans(priv)->ops->tx_agg_setup)
+                       break;
                if (iwlagn_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)
                        break;
                IWL_DEBUG_HT(priv, "start Tx\n");