struct ath_tx_control {
struct ath_txq *txq;
struct ath_node *an;
-@@ -658,11 +655,10 @@ enum sc_op_flags {
+@@ -299,6 +296,7 @@ struct ath_tx {
+ struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
+ struct ath_descdma txdma;
+ struct ath_txq *txq_map[IEEE80211_NUM_ACS];
++ struct ath_txq *uapsdq;
+ u32 txq_max_pending[IEEE80211_NUM_ACS];
+ u16 max_aggr_framelen[IEEE80211_NUM_ACS][4][32];
+ };
+@@ -356,6 +354,11 @@ void ath_tx_aggr_resume(struct ath_softc
+ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);
+ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
+ struct ath_node *an);
++void ath9k_release_buffered_frames(struct ieee80211_hw *hw,
++ struct ieee80211_sta *sta,
++ u16 tids, int nframes,
++ enum ieee80211_frame_release_type reason,
++ bool more_data);
+
+ /********/
+ /* VIFs */
+@@ -410,6 +413,7 @@ struct ath_beacon {
+ struct ath_descdma bdma;
+ struct ath_txq *cabq;
+ struct list_head bbuf;
++ int cabq_dur;
+
+ bool tx_processed;
+ bool tx_last;
+@@ -658,11 +662,10 @@ enum sc_op_flags {
struct ath_rate_table;
struct ath9k_vif_iter_data {
ath9k_ps_restore(sc);
break;
case IEEE80211_AMPDU_TX_OPERATIONAL:
+@@ -2366,6 +2378,7 @@ struct ieee80211_ops ath9k_ops = {
+ .flush = ath9k_flush,
+ .tx_frames_pending = ath9k_tx_frames_pending,
+ .tx_last_beacon = ath9k_tx_last_beacon,
++ .release_buffered_frames = ath9k_release_buffered_frames,
+ .get_stats = ath9k_get_stats,
+ .set_antenna = ath9k_set_antenna,
+ .get_antenna = ath9k_get_antenna,
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -798,6 +798,10 @@
* @ssid_len: Length of SSID given in @ssid.
* @hidden_ssid: The SSID of the current vif is hidden. Only valid in AP-mode.
* @txpower: TX power in dBm
-@@ -562,6 +562,9 @@ enum mac80211_rate_control_flags {
+@@ -459,6 +459,8 @@ struct ieee80211_bss_conf {
+ * @IEEE80211_TX_CTL_DONTFRAG: Don't fragment this packet even if it
+ * would be fragmented by size (this is optional, only used for
+ * monitor injection).
++ * @IEEE80211_TX_CTL_PS_RESPONSE: This frame is a response to a poll
++ * frame (PS-Poll or uAPSD).
+ *
+ * Note: If you have to add new flags to the enumeration, then don't
+ * forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
+@@ -494,6 +496,7 @@ enum mac80211_tx_control_flags {
+ IEEE80211_TX_STATUS_EOSP = BIT(28),
+ IEEE80211_TX_CTL_USE_MINRATE = BIT(29),
+ IEEE80211_TX_CTL_DONTFRAG = BIT(30),
++ IEEE80211_TX_CTL_PS_RESPONSE = BIT(31),
+ };
+
+ #define IEEE80211_TX_CTL_STBC_SHIFT 23
+@@ -562,6 +565,9 @@ enum mac80211_rate_control_flags {
/* maximum number of rate stages */
#define IEEE80211_TX_MAX_RATES 4
/**
* struct ieee80211_tx_rate - rate selection/status
*
-@@ -602,8 +605,8 @@ static inline void ieee80211_rate_set_vh
+@@ -602,8 +608,8 @@ static inline void ieee80211_rate_set_vh
u8 mcs, u8 nss)
{
WARN_ON(mcs & ~0xF);
}
static inline u8
-@@ -615,7 +618,7 @@ ieee80211_rate_get_vht_mcs(const struct
+@@ -615,7 +621,7 @@ ieee80211_rate_get_vht_mcs(const struct
static inline u8
ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
{
}
/**
-@@ -656,7 +659,11 @@ struct ieee80211_tx_info {
+@@ -656,7 +662,11 @@ struct ieee80211_tx_info {
struct ieee80211_tx_rate rates[
IEEE80211_TX_MAX_RATES];
s8 rts_cts_rate_idx;
};
/* only needed before rate control */
unsigned long jiffies;
-@@ -677,6 +684,8 @@ struct ieee80211_tx_info {
+@@ -677,6 +687,8 @@ struct ieee80211_tx_info {
struct {
struct ieee80211_tx_rate driver_rates[
IEEE80211_TX_MAX_RATES];
void *rate_driver_data[
IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
};
-@@ -840,6 +849,9 @@ enum mac80211_rx_flags {
+@@ -840,6 +852,9 @@ enum mac80211_rx_flags {
* @signal: signal strength when receiving this frame, either in dBm, in dB or
* unspecified depending on the hardware capabilities flags
* @IEEE80211_HW_SIGNAL_*
* @antenna: antenna used
* @rate_idx: index of data rate into band's supported rates or MCS index if
* HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
-@@ -871,6 +883,8 @@ struct ieee80211_rx_status {
+@@ -871,6 +886,8 @@ struct ieee80211_rx_status {
u8 band;
u8 antenna;
s8 signal;
u8 ampdu_delimiter_crc;
u8 vendor_radiotap_align;
u8 vendor_radiotap_oui[3];
-@@ -1018,13 +1032,13 @@ struct ieee80211_conf {
+@@ -1018,13 +1035,13 @@ struct ieee80211_conf {
* the driver passed into mac80211.
* @block_tx: Indicates whether transmission must be blocked before the
* scheduled channel switch, as indicated by the AP.
u8 count;
};
-@@ -1222,6 +1236,24 @@ enum ieee80211_sta_rx_bandwidth {
+@@ -1222,6 +1239,24 @@ enum ieee80211_sta_rx_bandwidth {
};
/**
* struct ieee80211_sta - station table entry
*
* A station table entry represents a station we are possibly
-@@ -1248,6 +1280,7 @@ enum ieee80211_sta_rx_bandwidth {
+@@ -1248,6 +1283,7 @@ enum ieee80211_sta_rx_bandwidth {
* notifications and capabilities. The value is only valid after
* the station moves to associated state.
* @smps_mode: current SMPS mode (off, static or dynamic)
*/
struct ieee80211_sta {
u32 supp_rates[IEEE80211_NUM_BANDS];
-@@ -1261,6 +1294,7 @@ struct ieee80211_sta {
+@@ -1261,6 +1297,7 @@ struct ieee80211_sta {
u8 rx_nss;
enum ieee80211_sta_rx_bandwidth bandwidth;
enum ieee80211_smps_mode smps_mode;
/* must be last */
u8 drv_priv[0] __aligned(sizeof(void *));
-@@ -1416,6 +1450,9 @@ struct ieee80211_tx_control {
+@@ -1416,6 +1453,9 @@ struct ieee80211_tx_control {
* for different virtual interfaces. See the doc section on HW queue
* control for more details.
*
* @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any
* P2P Interface. This will be honoured even if more than one interface
* is supported.
-@@ -1448,6 +1485,7 @@ enum ieee80211_hw_flags {
+@@ -1448,6 +1488,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_SUPPORTS_PER_STA_GTK = 1<<21,
IEEE80211_HW_AP_LINK_PS = 1<<22,
IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23,
IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26,
};
-@@ -3144,6 +3182,25 @@ void ieee80211_sta_set_buffered(struct i
+@@ -3144,6 +3185,25 @@ void ieee80211_sta_set_buffered(struct i
u8 tid, bool buffered);
/**
* ieee80211_tx_status - transmit status callback
*
* Call this function for all transmitted frames after they have been
-@@ -4118,7 +4175,7 @@ void ieee80211_send_bar(struct ieee80211
+@@ -4118,7 +4178,7 @@ void ieee80211_send_bar(struct ieee80211
* (deprecated; this will be removed once drivers get updated to use
* rate_idx_mask)
* @rate_idx_mask: user-requested (legacy) rate mask
* @bss: whether this frame is sent out in AP or IBSS mode
*/
struct ieee80211_tx_rate_control {
-@@ -4130,7 +4187,7 @@ struct ieee80211_tx_rate_control {
+@@ -4130,7 +4190,7 @@ struct ieee80211_tx_rate_control {
bool rts, short_preamble;
u8 max_rate_idx;
u32 rate_idx_mask;
bool bss;
};
-@@ -4219,6 +4276,22 @@ bool rate_usable_index_exists(struct iee
+@@ -4219,6 +4279,22 @@ bool rate_usable_index_exists(struct iee
return false;
}
if (sta_prepare_rate_control(local, sta, gfp)) {
kfree(sta);
+@@ -1130,6 +1132,7 @@ static void ieee80211_send_null_response
+ * ends the poll/service period.
+ */
+ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
++ IEEE80211_TX_CTL_PS_RESPONSE |
+ IEEE80211_TX_STATUS_EOSP |
+ IEEE80211_TX_CTL_REQ_TX_STATUS;
+
+@@ -1267,7 +1270,8 @@ ieee80211_sta_ps_deliver_response(struct
+ * STA may still remain is PS mode after this frame
+ * exchange.
+ */
+- info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
++ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
++ IEEE80211_TX_CTL_PS_RESPONSE;
+
+ /*
+ * Use MoreData flag to indicate whether there are
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2270,6 +2270,7 @@ static const struct nla_policy mntr_flag
change = true;
}
-+ if ((*flags & NL80211_MNTR_FLAG_ACTIVE) &&
++ if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) &&
+ !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
+ return -EOPNOTSUPP;
+
NL80211_STA_INFO_TX_BITRATE))
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -768,7 +768,8 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -433,6 +433,8 @@ static int ath9k_init_queues(struct ath_
+ sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
+ ath_cabq_update(sc);
+
++ sc->tx.uapsdq = ath_txq_setup(sc, ATH9K_TX_QUEUE_UAPSD, 0);
++
+ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
+ sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
+ sc->tx.txq_map[i]->mac80211_qnum = i;
+@@ -768,7 +770,8 @@ void ath9k_set_hw_capab(struct ath_softc
IEEE80211_HW_SUPPORTS_PS |
IEEE80211_HW_PS_NULLFUNC_STACK |
IEEE80211_HW_SPECTRUM_MGMT |
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
-@@ -776,6 +777,8 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -776,6 +779,8 @@ void ath9k_set_hw_capab(struct ath_softc
if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt)
hw->flags |= IEEE80211_HW_MFP_CAPABLE;
/*
* complete the acked-ones/xretried ones; update
* block-ack window
-@@ -593,9 +576,6 @@ static void ath_tx_complete_aggr(struct
+@@ -535,6 +518,10 @@ static void ath_tx_complete_aggr(struct
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
+ !txfail);
+ } else {
++ if (tx_info->flags & IEEE80211_TX_STATUS_EOSP) {
++ tx_info->flags &= ~IEEE80211_TX_STATUS_EOSP;
++ ieee80211_sta_eosp(sta);
++ }
+ /* retry the un-acked ones */
+ if (bf->bf_next == NULL && bf_last->bf_stale) {
+ struct ath_buf *tbf;
+@@ -593,9 +580,6 @@ static void ath_tx_complete_aggr(struct
ath_txq_lock(sc, txq);
}
rcu_read_unlock();
if (needreset)
-@@ -612,6 +592,7 @@ static void ath_tx_process_buffer(struct
+@@ -612,6 +596,7 @@ static void ath_tx_process_buffer(struct
struct ath_tx_status *ts, struct ath_buf *bf,
struct list_head *bf_head)
{
bool txok, flush;
txok = !(ts->ts_status & ATH9K_TXERR_MASK);
-@@ -623,8 +604,12 @@ static void ath_tx_process_buffer(struct
+@@ -623,8 +608,12 @@ static void ath_tx_process_buffer(struct
txq->axq_ampdu_depth--;
if (!bf_isampdu(bf)) {
ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
} else
ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
-@@ -668,7 +653,7 @@ static u32 ath_lookup_rate(struct ath_so
+@@ -668,7 +657,7 @@ static u32 ath_lookup_rate(struct ath_so
skb = bf->bf_mpdu;
tx_info = IEEE80211_SKB_CB(skb);
/*
* Find the lowest frame length among the rate series that will have a
-@@ -736,8 +721,6 @@ static int ath_compute_num_delims(struct
+@@ -736,8 +725,6 @@ static int ath_compute_num_delims(struct
bool first_subfrm)
{
#define FIRST_DESC_NDELIMS 60
u32 nsymbits, nsymbols;
u16 minlen;
u8 flags, rix;
-@@ -778,8 +761,8 @@ static int ath_compute_num_delims(struct
+@@ -778,8 +765,8 @@ static int ath_compute_num_delims(struct
if (tid->an->mpdudensity == 0)
return ndelim;
width = (flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ? 1 : 0;
half_gi = (flags & IEEE80211_TX_RC_SHORT_GI) ? 1 : 0;
-@@ -858,6 +841,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -803,25 +790,20 @@ static int ath_compute_num_delims(struct
+ return ndelim;
+ }
+
+-static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
+- struct ath_txq *txq,
+- struct ath_atx_tid *tid,
+- struct list_head *bf_q,
+- int *aggr_len)
++static struct ath_buf *
++ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
++ struct ath_atx_tid *tid)
+ {
+-#define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
+- struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL;
+- int rl = 0, nframes = 0, ndelim, prev_al = 0;
+- u16 aggr_limit = 0, al = 0, bpad = 0,
+- al_delta, h_baw = tid->baw_size / 2;
+- enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
+- struct ieee80211_tx_info *tx_info;
+ struct ath_frame_info *fi;
+ struct sk_buff *skb;
++ struct ath_buf *bf;
+ u16 seqno;
+
+- do {
++ while (1) {
+ skb = skb_peek(&tid->buf_q);
++ if (!skb)
++ break;
++
+ fi = get_frame_info(skb);
+ bf = fi->bf;
+ if (!fi->bf)
+@@ -837,10 +819,8 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ seqno = bf->bf_state.seqno;
+
+ /* do not step over block-ack window */
+- if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
+- status = ATH_AGGR_BAW_CLOSED;
++ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno))
+ break;
+- }
+
+ if (tid->bar_index > ATH_BA_INDEX(tid->seq_start, seqno)) {
+ struct ath_tx_status ts = {};
+@@ -854,10 +834,45 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ continue;
+ }
+
++ bf->bf_next = NULL;
++ bf->bf_lastbf = bf;
++ return bf;
++ }
++
++ return NULL;
++}
++
++static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
++ struct ath_txq *txq,
++ struct ath_atx_tid *tid,
++ struct list_head *bf_q,
++ int *aggr_len)
++{
++#define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
++ struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL;
++ int rl = 0, nframes = 0, ndelim, prev_al = 0;
++ u16 aggr_limit = 0, al = 0, bpad = 0,
++ al_delta, h_baw = tid->baw_size / 2;
++ enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
++ struct ieee80211_tx_info *tx_info;
++ struct ath_frame_info *fi;
++ struct sk_buff *skb;
++
++ do {
++ bf = ath_tx_get_tid_subframe(sc, txq, tid);
++ if (!bf) {
++ status = ATH_AGGR_BAW_CLOSED;
++ break;
++ }
++
++ skb = bf->bf_mpdu;
++ fi = get_frame_info(skb);
++
+ if (!bf_first)
bf_first = bf;
if (!rl) {
aggr_limit = ath_lookup_rate(sc, bf, tid);
rl = 1;
}
-@@ -998,14 +982,14 @@ static void ath_buf_set_rate(struct ath_
+@@ -898,7 +913,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+
+ /* link buffers of this frame to the aggregate */
+ if (!fi->retries)
+- ath_tx_addto_baw(sc, tid, seqno);
++ ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
+ bf->bf_state.ndelim = ndelim;
+
+ __skb_unlink(skb, &tid->buf_q);
+@@ -998,14 +1013,14 @@ static void ath_buf_set_rate(struct ath_
skb = bf->bf_mpdu;
tx_info = IEEE80211_SKB_CB(skb);
bool is_40, is_sgi, is_sp;
int phy;
-@@ -1224,9 +1208,6 @@ int ath_tx_aggr_start(struct ath_softc *
+@@ -1106,10 +1121,8 @@ static void ath_tx_fill_desc(struct ath_
+ struct ath_txq *txq, int len)
+ {
+ struct ath_hw *ah = sc->sc_ah;
+- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
+- struct ath_buf *bf_first = bf;
++ struct ath_buf *bf_first = NULL;
+ struct ath_tx_info info;
+- bool aggr = !!(bf->bf_state.bf_type & BUF_AGGR);
+
+ memset(&info, 0, sizeof(info));
+ info.is_first = true;
+@@ -1117,24 +1130,14 @@ static void ath_tx_fill_desc(struct ath_
+ info.txpower = MAX_RATE_POWER;
+ info.qcu = txq->axq_qnum;
+
+- info.flags = ATH9K_TXDESC_INTREQ;
+- if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
+- info.flags |= ATH9K_TXDESC_NOACK;
+- if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
+- info.flags |= ATH9K_TXDESC_LDPC;
+-
+- ath_buf_set_rate(sc, bf, &info, len);
+-
+- if (tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
+- info.flags |= ATH9K_TXDESC_CLRDMASK;
+-
+ if (bf->bf_state.bfs_paprd)
+ info.flags |= (u32) bf->bf_state.bfs_paprd << ATH9K_TXDESC_PAPRD_S;
+
+-
+ while (bf) {
+ struct sk_buff *skb = bf->bf_mpdu;
++ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+ struct ath_frame_info *fi = get_frame_info(skb);
++ bool aggr = !!(bf->bf_state.bf_type & BUF_AGGR);
+
+ info.type = get_hw_packet_type(skb);
+ if (bf->bf_next)
+@@ -1142,6 +1145,25 @@ static void ath_tx_fill_desc(struct ath_
+ else
+ info.link = 0;
+
++ if (!bf_first) {
++ bf_first = bf;
++
++ info.flags = ATH9K_TXDESC_INTREQ;
++ if ((tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) ||
++ txq == sc->tx.uapsdq)
++ info.flags |= ATH9K_TXDESC_CLRDMASK;
++
++ if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
++ info.flags |= ATH9K_TXDESC_NOACK;
++ if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
++ info.flags |= ATH9K_TXDESC_LDPC;
++
++ ath_buf_set_rate(sc, bf, &info, len);
++
++ if (txq == sc->beacon.cabq)
++ sc->beacon.cabq_dur += info.rates[0].PktDuration;
++ }
++
+ info.buf_addr[0] = bf->bf_buf_addr;
+ info.buf_len[0] = skb->len;
+ info.pkt_len = fi->framelen;
+@@ -1151,7 +1173,7 @@ static void ath_tx_fill_desc(struct ath_
+ if (aggr) {
+ if (bf == bf_first)
+ info.aggr = AGGR_BUF_FIRST;
+- else if (!bf->bf_next)
++ else if (bf == bf_first->bf_lastbf)
+ info.aggr = AGGR_BUF_LAST;
+ else
+ info.aggr = AGGR_BUF_MIDDLE;
+@@ -1160,6 +1182,9 @@ static void ath_tx_fill_desc(struct ath_
+ info.aggr_len = len;
+ }
+
++ if (bf == bf_first->bf_lastbf)
++ bf_first = NULL;
++
+ ath9k_hw_set_txdesc(ah, bf->bf_desc, &info);
+ bf = bf->bf_next;
+ }
+@@ -1224,9 +1249,6 @@ int ath_tx_aggr_start(struct ath_softc *
an = (struct ath_node *)sta->drv_priv;
txtid = ATH_AN_2_TID(an, tid);
/* update ampdu factor/density, they may have changed. This may happen
* in HT IBSS when a beacon with HT-info is received after the station
* has already been added.
-@@ -1238,7 +1219,7 @@ int ath_tx_aggr_start(struct ath_softc *
+@@ -1238,7 +1260,7 @@ int ath_tx_aggr_start(struct ath_softc *
an->mpdudensity = density;
}
txtid->paused = true;
*ssn = txtid->seq_start = txtid->seq_next;
txtid->bar_index = -1;
-@@ -1255,28 +1236,9 @@ void ath_tx_aggr_stop(struct ath_softc *
+@@ -1255,28 +1277,9 @@ void ath_tx_aggr_stop(struct ath_softc *
struct ath_atx_tid *txtid = ATH_AN_2_TID(an, tid);
struct ath_txq *txq = txtid->ac->txq;
ath_tx_flush_tid(sc, txtid);
ath_txq_unlock_complete(sc, txq);
}
-@@ -1342,18 +1304,28 @@ void ath_tx_aggr_wakeup(struct ath_softc
+@@ -1342,18 +1345,92 @@ void ath_tx_aggr_wakeup(struct ath_softc
}
}
+ }
+
+ ath_txq_unlock_complete(sc, txq);
++}
++
++void ath9k_release_buffered_frames(struct ieee80211_hw *hw,
++ struct ieee80211_sta *sta,
++ u16 tids, int nframes,
++ enum ieee80211_frame_release_type reason,
++ bool more_data)
++{
++ struct ath_softc *sc = hw->priv;
++ struct ath_node *an = (struct ath_node *)sta->drv_priv;
++ struct ath_txq *txq = sc->tx.uapsdq;
++ struct ieee80211_tx_info *info;
++ struct list_head bf_q;
++ struct ath_buf *bf_tail = NULL, *bf;
++ int sent = 0;
++ int i;
++
++ INIT_LIST_HEAD(&bf_q);
++ for (i = 0; tids && nframes; i++, tids >>= 1) {
++ struct ath_atx_tid *tid;
++
++ if (!(tids & 1))
++ continue;
++
++ tid = ATH_AN_2_TID(an, i);
++ if (tid->paused)
++ continue;
++
++ ath_txq_lock(sc, tid->ac->txq);
++ while (!skb_queue_empty(&tid->buf_q) && nframes > 0) {
++ bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid);
++ if (!bf)
++ break;
++
++ __skb_unlink(bf->bf_mpdu, &tid->buf_q);
++ list_add_tail(&bf->list, &bf_q);
++ ath_set_rates(tid->an->vif, tid->an->sta, bf);
++ ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
++ bf->bf_state.bf_type &= ~BUF_AGGR;
++ if (bf_tail)
++ bf_tail->bf_next = bf;
++
++ bf_tail = bf;
++ nframes--;
++ sent++;
++ TX_STAT_INC(txq->axq_qnum, a_queued_hw);
++
++ if (skb_queue_empty(&tid->buf_q))
++ ieee80211_sta_set_buffered(an->sta, i, false);
++ }
++ ath_txq_unlock_complete(sc, tid->ac->txq);
++ }
++
++ if (list_empty(&bf_q))
++ return;
++
++ info = IEEE80211_SKB_CB(bf_tail->bf_mpdu);
++ info->flags |= IEEE80211_TX_STATUS_EOSP;
++
++ bf = list_first_entry(&bf_q, struct ath_buf, list);
++ ath_txq_lock(sc, txq);
++ ath_tx_fill_desc(sc, bf, txq, 0);
++ ath_tx_txqaddbuf(sc, txq, &bf_q, false);
++ ath_txq_unlock(sc, txq);
}
/********************/
-@@ -1743,6 +1715,7 @@ static void ath_tx_send_ampdu(struct ath
+@@ -1709,8 +1786,9 @@ static void ath_tx_txqaddbuf(struct ath_
+ }
+ }
+
+-static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
+- struct sk_buff *skb, struct ath_tx_control *txctl)
++static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_txq *txq,
++ struct ath_atx_tid *tid, struct sk_buff *skb,
++ struct ath_tx_control *txctl)
+ {
+ struct ath_frame_info *fi = get_frame_info(skb);
+ struct list_head bf_head;
+@@ -1723,26 +1801,28 @@ static void ath_tx_send_ampdu(struct ath
+ * - seqno is not within block-ack window
+ * - h/w queue depth exceeds low water mark
+ */
+- if (!skb_queue_empty(&tid->buf_q) || tid->paused ||
+- !BAW_WITHIN(tid->seq_start, tid->baw_size, tid->seq_next) ||
+- txctl->txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) {
++ if ((!skb_queue_empty(&tid->buf_q) || tid->paused ||
++ !BAW_WITHIN(tid->seq_start, tid->baw_size, tid->seq_next) ||
++ txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) &&
++ txq != sc->tx.uapsdq) {
+ /*
+ * Add this frame to software queue for scheduling later
+ * for aggregation.
+ */
+- TX_STAT_INC(txctl->txq->axq_qnum, a_queued_sw);
++ TX_STAT_INC(txq->axq_qnum, a_queued_sw);
+ __skb_queue_tail(&tid->buf_q, skb);
+ if (!txctl->an || !txctl->an->sleeping)
+- ath_tx_queue_tid(txctl->txq, tid);
++ ath_tx_queue_tid(txq, tid);
+ return;
+ }
+
+- bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
++ bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+ if (!bf) {
+ ieee80211_free_txskb(sc->hw, skb);
return;
}
bf->bf_state.bf_type = BUF_AMPDU;
INIT_LIST_HEAD(&bf_head);
list_add(&bf->list, &bf_head);
-@@ -1892,49 +1865,6 @@ static struct ath_buf *ath_tx_setup_buff
+@@ -1751,10 +1831,10 @@ static void ath_tx_send_ampdu(struct ath
+ ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
+
+ /* Queue to h/w without aggregation */
+- TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw);
++ TX_STAT_INC(txq->axq_qnum, a_queued_hw);
+ bf->bf_lastbf = bf;
+- ath_tx_fill_desc(sc, bf, txctl->txq, fi->framelen);
+- ath_tx_txqaddbuf(sc, txctl->txq, &bf_head, false);
++ ath_tx_fill_desc(sc, bf, txq, fi->framelen);
++ ath_tx_txqaddbuf(sc, txq, &bf_head, false);
+ }
+
+ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
+@@ -1892,49 +1972,6 @@ static struct ath_buf *ath_tx_setup_buff
return bf;
}
/* Upon failure caller should free skb */
int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ath_tx_control *txctl)
-@@ -1945,8 +1875,11 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1945,8 +1982,11 @@ int ath_tx_start(struct ieee80211_hw *hw
struct ieee80211_vif *vif = info->control.vif;
struct ath_softc *sc = hw->priv;
struct ath_txq *txq = txctl->txq;
int q;
/* NOTE: sta can be NULL according to net/mac80211.h */
-@@ -2002,8 +1935,41 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -2002,8 +2042,47 @@ int ath_tx_start(struct ieee80211_hw *hw
txq->stopped = true;
}
- ath_tx_start_dma(sc, skb, txctl);
++ if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
++ ath_txq_unlock(sc, txq);
++ txq = sc->tx.uapsdq;
++ ath_txq_lock(sc, txq);
++ }
+
+ if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
+ tidno = ieee80211_get_qos_ctl(hdr)[0] &
+ IEEE80211_QOS_CTL_TID_MASK;
+ tid = ATH_AN_2_TID(txctl->an, tidno);
-
++
+ WARN_ON(tid->ac->txq != txctl->txq);
+ }
+
+ * Try aggregation if it's a unicast data frame
+ * and the destination is HT capable.
+ */
-+ ath_tx_send_ampdu(sc, tid, skb, txctl);
++ ath_tx_send_ampdu(sc, txq, tid, skb, txctl);
+ goto out;
+ }
+
-+ bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
++ bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+ if (!bf) {
+ if (txctl->paprd)
+ dev_kfree_skb_any(skb);
+ bf->bf_state.bfs_paprd_timestamp = jiffies;
+
+ ath_set_rates(vif, sta, bf);
-+ ath_tx_send_normal(sc, txctl->txq, tid, skb);
++ ath_tx_send_normal(sc, txq, tid, skb);
+
+out:
ath_txq_unlock(sc, txq);
return 0;
-@@ -2408,12 +2374,10 @@ void ath_tx_node_init(struct ath_softc *
+@@ -2054,7 +2133,12 @@ static void ath_tx_complete(struct ath_s
+ }
+ spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
+
++ __skb_queue_tail(&txq->complete_q, skb);
++
+ q = skb_get_queue_mapping(skb);
++ if (txq == sc->tx.uapsdq)
++ txq = sc->tx.txq_map[q];
++
+ if (txq == sc->tx.txq_map[q]) {
+ if (WARN_ON(--txq->pending_frames < 0))
+ txq->pending_frames = 0;
+@@ -2065,8 +2149,6 @@ static void ath_tx_complete(struct ath_s
+ txq->stopped = false;
+ }
+ }
+-
+- __skb_queue_tail(&txq->complete_q, skb);
+ }
+
+ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
+@@ -2408,12 +2490,10 @@ void ath_tx_node_init(struct ath_softc *
tid->baw_head = tid->baw_tail = 0;
tid->sched = false;
tid->paused = false;
}
for (acno = 0, ac = &an->ac[acno];
-@@ -2450,9 +2414,9 @@ void ath_tx_node_cleanup(struct ath_soft
+@@ -2450,9 +2530,9 @@ void ath_tx_node_cleanup(struct ath_soft
}
ath_tid_drain(sc, txq, tid);
}
/*
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -204,9 +204,15 @@ static struct ath_buf *ath9k_beacon_gene
+ }
+
+ ath9k_beacon_setup(sc, vif, bf, info->control.rates[0].idx);
++ sc->beacon.cabq_dur = 0;
+
+ while (skb) {
+ ath9k_tx_cabq(hw, skb);
++
++ if (sc->beacon.cabq_dur / 1000 - 1 >
++ sc->cur_beacon_conf.beacon_interval / ATH_BCBUF)
++ break;
++
+ skb = ieee80211_get_buffered_bc(hw, vif);
+ }
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+@@ -68,13 +68,16 @@
+ #define AR9300_BASE_ADDR 0x3ff
+ #define AR9300_BASE_ADDR_512 0x1ff
+
+-#define AR9300_OTP_BASE (AR_SREV_9340(ah) ? 0x30000 : 0x14000)
+-#define AR9300_OTP_STATUS (AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
++#define AR9300_OTP_BASE \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)
++#define AR9300_OTP_STATUS \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)
+ #define AR9300_OTP_STATUS_TYPE 0x7
+ #define AR9300_OTP_STATUS_VALID 0x4
+ #define AR9300_OTP_STATUS_ACCESS_BUSY 0x2
+ #define AR9300_OTP_STATUS_SM_BUSY 0x1
+-#define AR9300_OTP_READ_DATA (AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
++#define AR9300_OTP_READ_DATA \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)
+
+ enum targetPowerHTRates {
+ HT_TARGET_RATE_0_8_16,
projects / openwrt / svn-archive / archive.git / blobdiff