diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2008-09-06 17:29:11 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2008-09-06 17:29:11 +0000 |
| commit | 33b9a974d5d72670cc45c5dafa17e270174f90fc (patch) | |
| tree | 01b8bcfeb1d248f389370966bf1522e3dc405569 | |
| parent | d53fe7108b68633a804f36b59b9d5ca6957d33b4 (diff) | |
| download | src-33b9a974d5d72670cc45c5dafa17e270174f90fc.tar.gz src-33b9a974d5d72670cc45c5dafa17e270174f90fc.zip | |
moreve the aggregation q; it's not being used and
there's a better way to do this
Notes
Notes:
svn path=/head/; revision=182826
| -rw-r--r-- | sys/net80211/ieee80211_freebsd.h | 7 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_ht.c | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_ht.h | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index 39da760e14e9..fcd1b3fa8b8c 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -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; \ diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 22d5de3a1ef2..acbb0a74bf25 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -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; } diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h index b0eb616cdcbc..fe1c15d4ce02 100644 --- a/sys/net80211/ieee80211_ht.h +++ b/sys/net80211/ieee80211_ht.h @@ -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 */ }; |