From fe583b84f5912c5ed188325b0e985708dd6056ae Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 3 Feb 2011 20:26:26 +0000 Subject: [PATCH] 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. --- sys/dev/ath/if_ath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 0ae9e8d7659f..5eede3bdcb59 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -3892,9 +3892,15 @@ rx_accept: IEEE80211_KEYIX_NONE : rs->rs_keyix); sc->sc_lastrs = rs; if (ni != NULL) { +#if NOTYET /* 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) m->m_flags |= M_AMPDU; +#endif /* * Sending station is known, dispatch directly.