D54390.id168686.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54390.id168686.diff
View Options

	diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
	--- a/sys/net80211/ieee80211_ht.c
	+++ b/sys/net80211/ieee80211_ht.c
	@@ -1130,7 +1130,8 @@
	*/
	if (rap->rxa_qframes != 0) {
	/* XXX honor batimeout? */
	- if (ticks - rap->rxa_age > ieee80211_ampdu_age) {
	+ if (ieee80211_time_after(ticks - rap->rxa_age,
	+ ieee80211_ampdu_age)) {
	/*
	* Too long since we received the first
	* frame; flush the reorder buffer.
	@@ -1392,7 +1393,8 @@
	* See above for more details on what's happening here.
	*/
	/* XXX honor batimeout? */
	- if (ticks - rap->rxa_age > ieee80211_ampdu_age) {
	+ if (ieee80211_time_after(ticks - rap->rxa_age,
	+ ieee80211_ampdu_age)) {
	/*
	* Too long since we received the first
	* frame; flush the reorder buffer.
	@@ -2819,7 +2821,7 @@
	/* defer next try so we don't slam the driver with requests */
	tap->txa_attempts = ieee80211_addba_maxtries;
	/* NB: check in case driver wants to override */
	- if (tap->txa_nextrequest <= ticks)
	+ if (ieee80211_time_before_eq(tap->txa_nextrequest, ticks))
	tap->txa_nextrequest = ticks + ieee80211_addba_backoff;
	return 0;
	}