diff --git a/sys/netproto/802_11/wlan/ieee80211_ht.c b/sys/netproto/802_11/wlan/ieee80211_ht.c
--- a/sys/netproto/802_11/wlan/ieee80211_ht.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ht.c
@@ -567,7 +567,10 @@
 {
 	struct ieee80211_rx_ampdu *rap;
 
-	/* XXX TODO: sanity check tid, seq, baw */
+	if (tid < 0 || tid >= WME_NUM_TID)
+		return EINVAL;
+	if (baw < 0)
+		baw = 0;
 
 	rap = &ni->ni_rx_ampdu[tid];