moreve the aggregation q; it's not being used and
there's a better way to do this
This commit is contained in:
parent
d53fe7108b
commit
33b9a974d5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=182826
@ -148,13 +148,6 @@ typedef struct {
|
||||
_AGEQ_ENQUEUE(&ni->ni_savedq, _m, _qlen, _age); \
|
||||
} while (0)
|
||||
|
||||
#define IEEE80211_TAPQ_INIT(_tap) do { \
|
||||
mtx_init(&(tap)->txa_q.ifq_mtx, "ampdu tx queue", NULL, MTX_DEF); \
|
||||
(_tap)->txa_q.ifq_maxlen = IEEE80211_AGGR_BAWMAX; \
|
||||
} while (0)
|
||||
#define IEEE80211_TAPQ_DESTROY(_tap) \
|
||||
mtx_destroy(&(_tap)->txa_q.ifq_mtx)
|
||||
|
||||
#ifndef IF_PREPEND_LIST
|
||||
#define _IF_PREPEND_LIST(ifq, mhead, mtail, mcount) do { \
|
||||
(mtail)->m_nextpkt = (ifq)->ifq_head; \
|
||||
|
@ -804,7 +804,6 @@ ieee80211_ht_node_cleanup(struct ieee80211_node *ni)
|
||||
* to reclaim any resources it might have allocated.
|
||||
*/
|
||||
ic->ic_addba_stop(ni, &ni->ni_tx_ampdu[i]);
|
||||
IEEE80211_TAPQ_DESTROY(tap);
|
||||
tap->txa_lastsample = 0;
|
||||
tap->txa_avgpps = 0;
|
||||
/* NB: clearing NAK means we may re-send ADDBA */
|
||||
@ -1370,8 +1369,6 @@ ieee80211_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap)
|
||||
/* XXX locking */
|
||||
addba_stop_timeout(tap);
|
||||
if (tap->txa_flags & IEEE80211_AGGR_RUNNING) {
|
||||
/* clear aggregation queue */
|
||||
ieee80211_drain_ifq(&tap->txa_q);
|
||||
tap->txa_flags &= ~IEEE80211_AGGR_RUNNING;
|
||||
}
|
||||
tap->txa_attempts = 0;
|
||||
@ -1637,7 +1634,6 @@ ieee80211_ampdu_request(struct ieee80211_node *ni,
|
||||
/* XXX locking */
|
||||
if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) {
|
||||
/* do deferred setup of state */
|
||||
IEEE80211_TAPQ_INIT(tap);
|
||||
callout_init(&tap->txa_timer, CALLOUT_MPSAFE);
|
||||
tap->txa_flags |= IEEE80211_AGGR_SETUP;
|
||||
}
|
||||
|
@ -56,7 +56,6 @@ struct ieee80211_tx_ampdu {
|
||||
uint16_t txa_wnd; /* BA window size */
|
||||
uint8_t txa_attempts; /* # ADDBA requests w/o a response */
|
||||
int txa_nextrequest;/* soonest to make next ADDBA request */
|
||||
struct ifqueue txa_q; /* packet queue */
|
||||
struct callout txa_timer;
|
||||
void *txa_private; /* driver-private storage */
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user