Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / net / mac80211 / agg-tx.c

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index cce9d425c71812f0f6184a0c953d2d39f6d7eb83..c8ba2e77737c3c00acbe840d8f572258912f39ce 100644 (file)
--- 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,
                return -EINVAL;
 
        if ((tid >= IEEE80211_NUM_TIDS) ||
-           !(local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) ||
-           (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW))
+           !ieee80211_hw_check(&local->hw, AMPDU_AGGREGATION) ||
+           ieee80211_hw_check(&local->hw, TX_AMPDU_SETUP_IN_HW))
                return -EINVAL;
 
        ht_dbg(sdata, "Open BA session requested for %pM tid %u\n",