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

[pandora-kernel.git] / drivers / net / wireless / ath / carl9170 / carl9170.h

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 3d4ed58..f9a4655 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -67,6 +67,8 @@
 
 #define PAYLOAD_MAX    (CARL9170_MAX_CMD_LEN / 4 - 1)
 
+static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = { 3, 2, 1, 0 };
+
 enum carl9170_rf_init_mode {
        CARL9170_RFI_NONE,
        CARL9170_RFI_WARM,
@@ -286,6 +288,10 @@ struct ar9170 {
                unsigned int tx_seq_table;
        } fw;
 
+       /* interface configuration combinations */
+       struct ieee80211_iface_limit if_comb_limits[1];
+       struct ieee80211_iface_combination if_combs[1];
+
        /* reset / stuck frames/queue detection */
        struct work_struct restart_work;
        struct work_struct ping_work;
@@ -436,7 +442,6 @@ struct ar9170 {
 enum carl9170_ps_off_override_reasons {
        PS_OFF_VIF      = BIT(0),
        PS_OFF_BCN      = BIT(1),
-       PS_OFF_5GHZ     = BIT(2),
 };
 
 struct carl9170_ba_stats {
@@ -448,6 +453,8 @@ struct carl9170_ba_stats {
 
 struct carl9170_sta_info {
        bool ht_sta;
+       bool sleeping;
+       atomic_t pending_frames;
        unsigned int ampdu_max_len;
        struct carl9170_sta_tid *agg[CARL9170_NUM_TID];
        struct carl9170_ba_stats stats[CARL9170_NUM_TID];