summaryrefslogtreecommitdiffstats
path: root/net/mac80211/agg-tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-06-02 15:39:54 -0400
committerJohannes Berg <johannes.berg@intel.com>2015-06-10 10:05:36 -0400
commit30686bf7f5b3c30831761e188a6e3cb33580fa48 (patch)
tree65be6b3ae5d661bf076af64855555f562fe356fd /net/mac80211/agg-tx.c
parent206c59d1d7d42bcafc1d7f1e476e87e4427e2345 (diff)
mac80211: convert HW flags to unsigned long bitmap
As we're running out of hardware capability flags pretty quickly, convert them to use the regular test_bit() style unsigned long bitmaps. This introduces a number of helper functions/macros to set and to test the bits, along with new debugfs code. The occurrences of an explicit __clear_bit() are intentional, the drivers were never supposed to change their supported bits on the fly. We should investigate changing this to be a per-frame flag. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/agg-tx.c')
-rw-r--r--net/mac80211/agg-tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index cce9d425c718..c8ba2e77737c 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -564,8 +564,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
564 return -EINVAL; 564 return -EINVAL;
565 565
566 if ((tid >= IEEE80211_NUM_TIDS) || 566 if ((tid >= IEEE80211_NUM_TIDS) ||
567 !(local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) || 567 !ieee80211_hw_check(&local->hw, AMPDU_AGGREGATION) ||
568 (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)) 568 ieee80211_hw_check(&local->hw, TX_AMPDU_SETUP_IN_HW))
569 return -EINVAL; 569 return -EINVAL;
570 570
571 ht_dbg(sdata, "Open BA session requested for %pM tid %u\n", 571 ht_dbg(sdata, "Open BA session requested for %pM tid %u\n",