.. | .. |
---|
1374 | 1374 | int ret; |
---|
1375 | 1375 | |
---|
1376 | 1376 | mutex_lock(&ar->mutex); |
---|
1377 | | - if (queue < ar->hw->queues) { |
---|
1378 | | - memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param)); |
---|
1379 | | - ret = carl9170_set_qos(ar); |
---|
1380 | | - } else { |
---|
1381 | | - ret = -EINVAL; |
---|
1382 | | - } |
---|
1383 | | - |
---|
| 1377 | + memcpy(&ar->edcf[ar9170_qmap(queue)], param, sizeof(*param)); |
---|
| 1378 | + ret = carl9170_set_qos(ar); |
---|
1384 | 1379 | mutex_unlock(&ar->mutex); |
---|
1385 | 1380 | return ret; |
---|
1386 | 1381 | } |
---|
.. | .. |
---|
1441 | 1436 | rcu_assign_pointer(sta_info->agg[tid], tid_info); |
---|
1442 | 1437 | spin_unlock_bh(&ar->tx_ampdu_list_lock); |
---|
1443 | 1438 | |
---|
1444 | | - ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); |
---|
1445 | | - break; |
---|
| 1439 | + return IEEE80211_AMPDU_TX_START_IMMEDIATE; |
---|
1446 | 1440 | |
---|
1447 | 1441 | case IEEE80211_AMPDU_TX_STOP_CONT: |
---|
1448 | 1442 | case IEEE80211_AMPDU_TX_STOP_FLUSH: |
---|
.. | .. |
---|
1922 | 1916 | WARN_ON(!(tx_streams >= 1 && tx_streams <= |
---|
1923 | 1917 | IEEE80211_HT_MCS_TX_MAX_STREAMS)); |
---|
1924 | 1918 | |
---|
1925 | | - tx_params = (tx_streams - 1) << |
---|
| 1919 | + tx_params |= (tx_streams - 1) << |
---|
1926 | 1920 | IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT; |
---|
1927 | 1921 | |
---|
1928 | 1922 | carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params; |
---|