diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h
index fe510304598..e6f1bd88309 100644
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -173,9 +173,9 @@ struct ieee80211_rate {
 };
 
 struct ieee80211_sta_ht_cap {
-		/* TODO FIXME */
-	int	ampdu_density, ampdu_factor;
 	bool					ht_supported;
+	uint8_t					ampdu_density;
+	uint8_t					ampdu_factor;
 	uint16_t				cap;
 	struct ieee80211_mcs_info		mcs;
 };
diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 73db0083626..75f2dac02be 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -623,13 +623,16 @@ struct ieee80211_link_sta {
 #define	IEEE80211_NUM_TIDS			16	/* net80211::WME_NUM_TID */
 struct ieee80211_sta {
 	/* TODO FIXME */
-	int		max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len, max_sp;
-	int		mfp, smps_mode, tdls, tdls_initiator, uapsd_queues, wme;
+	int		max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len;
+	int		mfp, smps_mode, tdls, tdls_initiator;
 	struct ieee80211_txq			*txq[IEEE80211_NUM_TIDS + 1];	/* iwlwifi: 8 and adds +1 to tid_data, net80211::IEEE80211_TID_SIZE */
 	struct ieee80211_sta_rates		*rates;	/* some rcu thing? */
 	uint32_t				max_tid_amsdu_len[IEEE80211_NUM_TIDS];
 	uint8_t					addr[ETH_ALEN];
 	uint16_t				aid;
+	bool					wme;
+	uint8_t					max_sp;
+	uint8_t					uapsd_queues;
 
 	struct ieee80211_link_sta		deflink;