Disable the code I previously added from Rui's 802.11n branch.

A-MPDU RX interferes with packet retransmission/reordering.
In local testing, I was seeing A-MPDU being negotiated and then
not used by the AP sending frames to the STA; the STA would then
treat non A-MPDU frames that are retransmits as out of the window
and get plain confused.

The hardware RX status descriptor has a "I'm part of an aggregate"
bit; so this should eventually be tested and then punted to the
A-MPDU reorder handling only if it has this bit set.
This commit is contained in:
Adrian Chadd 2011-02-03 20:26:26 +00:00
parent c446091b1e
commit fe583b84f5

View File

@ -3892,9 +3892,15 @@ rx_accept:
IEEE80211_KEYIX_NONE : rs->rs_keyix); IEEE80211_KEYIX_NONE : rs->rs_keyix);
sc->sc_lastrs = rs; sc->sc_lastrs = rs;
if (ni != NULL) { if (ni != NULL) {
#if NOTYET
/* tag AMPDU aggregates for reorder processing */ /* tag AMPDU aggregates for reorder processing */
/*
* XXX this should only tag frames marked as aggregate; rather
* XXX than all frames.
*/
if (ni->ni_flags & IEEE80211_NODE_HT) if (ni->ni_flags & IEEE80211_NODE_HT)
m->m_flags |= M_AMPDU; m->m_flags |= M_AMPDU;
#endif
/* /*
* Sending station is known, dispatch directly. * Sending station is known, dispatch directly.