1 files changed, 2 insertions, 27 deletions

diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index 618252f..16135e1 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
@@ -1047,7 +1046,6 @@ ieee80211_ht_node_init(struct ieee80211_node *ni)
 		tap = &ni->ni_tx_ampdu[tid];
 		tap->txa_tid = tid;
 		tap->txa_ni = ni;
-		tap->txa_lastsample = ticks;
 		/* NB: further initialization deferred */
 	}
 	ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU;
@@ -1217,7 +1215,6 @@ ieee80211_ht_wds_init(struct ieee80211_node *ni)
 	for (tid = 0; tid < WME_NUM_TID; tid++) {
 		tap = &ni->ni_tx_ampdu[tid];
 		tap->txa_tid = tid;
-		tap->txa_lastsample = ticks;
 	}
 	/* NB: AMPDU tx/rx governed by IEEE80211_FHT_AMPDU_{TX,RX} */
 	ni->ni_flags |= IEEE80211_NODE_HT | IEEE80211_NODE_AMPDU;
@@ -1693,7 +1690,6 @@ ampdu_tx_setup(struct ieee80211_tx_ampdu *tap)
 {
 	callout_init(&tap->txa_timer, CALLOUT_MPSAFE);
 	tap->txa_flags |= IEEE80211_AGGR_SETUP;
-	tap->txa_lastsample = ticks;
 }
 
 static void
@@ -1721,12 +1717,8 @@ ampdu_tx_stop(struct ieee80211_tx_ampdu *tap)
 	 */
 	bar_stop_timer(tap);
 
-	/*
-	 * Reset packet estimate.
-	 */
-	tap->txa_lastsample = ticks;
+	tap->txa_lastsample = 0;
 	tap->txa_avgpps = 0;
-
 	/* NB: clearing NAK means we may re-send ADDBA */ 
 	tap->txa_flags &= ~(IEEE80211_AGGR_SETUP | IEEE80211_AGGR_NAK);
 }
@@ -2662,24 +2654,10 @@ ieee80211_add_htcap_body(uint8_t *frm, struct ieee80211_node *ni)
 			caps |= IEEE80211_HTCAP_CHWIDTH40;
 		else
 			caps &= ~IEEE80211_HTCAP_CHWIDTH40;
-
-		/* Start by using the advertised settings */
+		/* use advertised setting (XXX locally constraint) */
 		rxmax = MS(ni->ni_htparam, IEEE80211_HTCAP_MAXRXAMPDU);
 		density = MS(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY);
 
-		/* Cap at VAP rxmax */
-		if (rxmax > vap->iv_ampdu_rxmax)
-			rxmax = vap->iv_ampdu_rxmax;
-
-		/*
-		 * If the VAP ampdu density value greater, use that.
-		 *
-		 * (Larger density value == larger minimum gap between A-MPDU
-		 * subframes.)
-		 */
-		if (vap->iv_ampdu_density > density)
-			density = vap->iv_ampdu_density;
-
 		/*
 		 * NB: Hardware might support HT40 on some but not all
 		 * channels. We can't determine this earlier because only
@@ -2696,12 +2674,9 @@ ieee80211_add_htcap_body(uint8_t *frm, struct ieee80211_node *ni)
 			caps |= IEEE80211_HTCAP_CHWIDTH40;
 		else
 			caps &= ~IEEE80211_HTCAP_CHWIDTH40;
-
-		/* XXX TODO should it start by using advertised settings? */
 		rxmax = vap->iv_ampdu_rxmax;
 		density = vap->iv_ampdu_density;
 	}
-
 	/* adjust short GI based on channel and config */
 	if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) == 0)
 		caps &= ~IEEE80211_HTCAP_SHORTGI20;