diff options
| author | Johannes Berg | 2012-03-15 21:26:52 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-04-09 22:37:22 +0200 |
| commit | 9eae88fa9a02e31af69a215beaa5e1194da3a5a1 (patch) | |
| tree | 147ed04cc911430969a4d256a0c41ae33f0a1b06 /drivers/net/wireless/iwlwifi/iwl-mac80211.c | |
| parent | iwlwifi: use scan while idle (diff) | |
| download | kernel-qcow2-linux-9eae88fa9a02e31af69a215beaa5e1194da3a5a1.tar.gz kernel-qcow2-linux-9eae88fa9a02e31af69a215beaa5e1194da3a5a1.tar.xz kernel-qcow2-linux-9eae88fa9a02e31af69a215beaa5e1194da3a5a1.zip | |
iwlwifi: move queue mapping out of transport
The queue mapping is not only dynamic, it
is also dependent on the uCode, as we can
already see today with the dual-mode and
non-dual-mode being different.
Move the queue mapping out of the transport
layer and let the higher layer manage it.
Part of the transport configuration is how
to set up the queues.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index d2be4b60488d..1bd021a24a8a 100644 --- 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"); |