diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-11-14 17:22:21 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-19 09:44:00 -0500 |
commit | 5a306f5887d5fd840beb8ea872897fa89e8fcdef (patch) | |
tree | dadc13f05e360f8f35c15acb36a860056f4848fe /net/mac80211/agg-tx.c | |
parent | 0f92732344e88023807342fef4c566e0660c2fd9 (diff) |
mac80211: introduce IEEE80211_NUM_TIDS and use it
Introduce IEEE80211_NUM_TIDS in the generic 802.11
header file and use it in place of STA_TID_NUM and
NUM_RX_DATA_QUEUES which are both really the number
of TIDs.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/agg-tx.c')
-rw-r--r-- | net/mac80211/agg-tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 3195a6307f50..4152ed1034b8 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c | |||
@@ -448,7 +448,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, | |||
448 | if (WARN_ON(!local->ops->ampdu_action)) | 448 | if (WARN_ON(!local->ops->ampdu_action)) |
449 | return -EINVAL; | 449 | return -EINVAL; |
450 | 450 | ||
451 | if ((tid >= STA_TID_NUM) || | 451 | if ((tid >= IEEE80211_NUM_TIDS) || |
452 | !(local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) || | 452 | !(local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) || |
453 | (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)) | 453 | (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)) |
454 | return -EINVAL; | 454 | return -EINVAL; |
@@ -605,9 +605,9 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) | |||
605 | 605 | ||
606 | trace_api_start_tx_ba_cb(sdata, ra, tid); | 606 | trace_api_start_tx_ba_cb(sdata, ra, tid); |
607 | 607 | ||
608 | if (tid >= STA_TID_NUM) { | 608 | if (tid >= IEEE80211_NUM_TIDS) { |
609 | ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n", | 609 | ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n", |
610 | tid, STA_TID_NUM); | 610 | tid, IEEE80211_NUM_TIDS); |
611 | return; | 611 | return; |
612 | } | 612 | } |
613 | 613 | ||
@@ -687,7 +687,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) | |||
687 | if (!local->ops->ampdu_action) | 687 | if (!local->ops->ampdu_action) |
688 | return -EINVAL; | 688 | return -EINVAL; |
689 | 689 | ||
690 | if (tid >= STA_TID_NUM) | 690 | if (tid >= IEEE80211_NUM_TIDS) |
691 | return -EINVAL; | 691 | return -EINVAL; |
692 | 692 | ||
693 | spin_lock_bh(&sta->lock); | 693 | spin_lock_bh(&sta->lock); |
@@ -722,9 +722,9 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) | |||
722 | 722 | ||
723 | trace_api_stop_tx_ba_cb(sdata, ra, tid); | 723 | trace_api_stop_tx_ba_cb(sdata, ra, tid); |
724 | 724 | ||
725 | if (tid >= STA_TID_NUM) { | 725 | if (tid >= IEEE80211_NUM_TIDS) { |
726 | ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n", | 726 | ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n", |
727 | tid, STA_TID_NUM); | 727 | tid, IEEE80211_NUM_TIDS); |
728 | return; | 728 | return; |
729 | } | 729 | } |
730 | 730 | ||