svn commit: r297775 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Sun Apr 10 04:16:34 2016
New Revision: 297775
URL: https://svnweb.freebsd.org/changeset/base/297775

Log:
  [net80211] correctly (i hope, wow) do a ticks comparison to limit A-MPDU attempts
  
  I was seeing the stack constantly attempt to renegotiate A-MPDU TX
  even after 3 failures.  My hunch is that the direct ticks comparison
  is failing around the ticks wrap-around point.
  
  This failure shouldn't /really/ happen normally, but it turns out being
  the IBSS master node on FreeBSD doesn't quite setup 11n right, so
  negotiating A-MPDU TX fails.

Modified:
  head/sys/net80211/ieee80211_ht.c

Modified: head/sys/net80211/ieee80211_ht.c
==============================================================================
--- head/sys/net80211/ieee80211_ht.c	Sun Apr 10 03:35:17 2016	(r297774)
+++ head/sys/net80211/ieee80211_ht.c	Sun Apr 10 04:16:34 2016	(r297775)
@@ -2157,7 +2157,7 @@ ieee80211_ampdu_enable(struct ieee80211_
 		return 0;
 	/* XXX check rssi? */
 	if (tap->txa_attempts >= ieee80211_addba_maxtries &&
-	    ticks < tap->txa_nextrequest) {
+	    ieee80211_time_after(ticks, tap->txa_nextrequest)) {
 		/*
 		 * Don't retry too often; txa_nextrequest is set
 		 * to the minimum interval we'll retry after