mac80211: update to wireless-testing 2011-08-26
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 550-ath9k_limit_qlen.patch
1 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
2 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
3 @@ -240,6 +240,7 @@ struct ath_atx_tid {
4 struct ath_node *an;
5 struct ath_atx_ac *ac;
6 unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];
7 + int buf_pending;
8 u16 seq_start;
9 u16 seq_next;
10 u16 baw_size;
11 @@ -286,6 +287,9 @@ struct ath_tx_control {
12 * (axq_qnum).
13 */
14 struct ath_tx {
15 + u32 qlen_single;
16 + u32 qlen_aggr;
17 +
18 u16 seq_no;
19 u32 txqsetup;
20 spinlock_t txbuflock;
21 --- a/drivers/net/wireless/ath/ath9k/debug.c
22 +++ b/drivers/net/wireless/ath/ath9k/debug.c
23 @@ -1341,6 +1341,10 @@ int ath9k_init_debug(struct ath_hw *ah)
24 sc, &fops_wiphy);
25 debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
26 &fops_xmit);
27 + debugfs_create_u32("qlen_single", S_IRUSR | S_IWUSR,
28 + sc->debug.debugfs_phy, &sc->tx.qlen_single);
29 + debugfs_create_u32("qlen_aggr", S_IRUSR | S_IWUSR,
30 + sc->debug.debugfs_phy, &sc->tx.qlen_aggr);
31 debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
32 &fops_stations);
33 debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
34 --- a/drivers/net/wireless/ath/ath9k/xmit.c
35 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
36 @@ -348,6 +348,14 @@ static void ath_tx_count_frames(struct a
37 }
38 }
39
40 +static struct ath_atx_tid *ath_get_tid(struct ath_node *an, struct sk_buff *skb)
41 +{
42 + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
43 + u8 tidno;
44 +
45 + tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
46 + return ATH_AN_2_TID(an, tidno);
47 +}
48
49 static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
50 struct ath_buf *bf, struct list_head *bf_q,
51 @@ -438,6 +446,8 @@ static void ath_tx_complete_aggr(struct
52 __skb_queue_head_init(&bf_pending);
53
54 ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
55 + tid->buf_pending -= nframes;
56 +
57 while (bf) {
58 u16 seqno = bf->bf_state.seqno;
59
60 @@ -834,6 +844,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
61 ath_tx_addto_baw(sc, tid, seqno);
62 ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim);
63
64 + tid->buf_pending++;
65 __skb_unlink(skb, &tid->buf_q);
66 list_add_tail(&bf->list, bf_q);
67 if (bf_prev) {
68 @@ -1489,6 +1500,8 @@ static void ath_tx_send_ampdu(struct ath
69 /* Add sub-frame to BAW */
70 ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
71
72 + tid->buf_pending++;
73 +
74 /* Queue to h/w without aggregation */
75 TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw);
76 bf->bf_lastbf = bf;
77 @@ -1817,23 +1830,13 @@ error:
78
79 /* FIXME: tx power */
80 static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
81 - struct ath_tx_control *txctl)
82 + struct ath_tx_control *txctl,
83 + struct ath_atx_tid *tid)
84 {
85 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
86 - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
87 - struct ath_atx_tid *tid = NULL;
88 struct ath_buf *bf;
89 - u8 tidno;
90
91 spin_lock_bh(&txctl->txq->axq_lock);
92 - if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
93 - ieee80211_is_data_qos(hdr->frame_control)) {
94 - tidno = ieee80211_get_qos_ctl(hdr)[0] &
95 - IEEE80211_QOS_CTL_TID_MASK;
96 - tid = ATH_AN_2_TID(txctl->an, tidno);
97 -
98 - WARN_ON(tid->ac->txq != txctl->txq);
99 - }
100
101 if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
102 /*
103 @@ -1875,6 +1878,7 @@ int ath_tx_start(struct ieee80211_hw *hw
104 struct ieee80211_vif *vif = info->control.vif;
105 struct ath_softc *sc = hw->priv;
106 struct ath_txq *txq = txctl->txq;
107 + struct ath_atx_tid *tid = NULL;
108 int padpos, padsize;
109 int frmlen = skb->len + FCS_LEN;
110 int q;
111 @@ -1907,6 +1911,7 @@ int ath_tx_start(struct ieee80211_hw *hw
112
113 skb_push(skb, padsize);
114 memmove(skb->data, skb->data + padsize, padpos);
115 + hdr = (struct ieee80211_hdr *) skb->data;
116 }
117
118 if ((vif && vif->type != NL80211_IFTYPE_AP &&
119 @@ -1916,6 +1921,24 @@ int ath_tx_start(struct ieee80211_hw *hw
120
121 setup_frame_info(hw, skb, frmlen);
122
123 + if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
124 + ieee80211_is_data_qos(hdr->frame_control)) {
125 + tid = ath_get_tid(txctl->an, skb);
126 +
127 + WARN_ON(tid->ac->txq != txq);
128 + }
129 +
130 + if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
131 + if (sc->tx.qlen_aggr > 0 && skb_queue_len(&tid->buf_q) +
132 + tid->buf_pending >= sc->tx.qlen_aggr)
133 + return -ENOMEM;
134 + } else {
135 + if (sc->tx.qlen_single > 0 &&
136 + txq->axq_depth - txq->axq_ampdu_depth >=
137 + sc->tx.qlen_single)
138 + return -ENOMEM;
139 + }
140 +
141 /*
142 * At this point, the vif, hw_key and sta pointers in the tx control
143 * info are no longer valid (overwritten by the ath_frame_info data.
144 @@ -1930,7 +1953,7 @@ int ath_tx_start(struct ieee80211_hw *hw
145 }
146 spin_unlock_bh(&txq->axq_lock);
147
148 - ath_tx_start_dma(sc, skb, txctl);
149 + ath_tx_start_dma(sc, skb, txctl, tid);
150 return 0;
151 }
152