diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4a63c4bdefeb2d187abfdbc78c8e49ee92048e1b..6b2e88a4e9fb2da4ef7ae49495b5898a71cf9260 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2109,7 +2109,11 @@ static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
 			}
 
 			vht_mcs = iterator.this_arg[4] >> 4;
+			if (vht_mcs > 11)
+				vht_mcs = 0;
 			vht_nss = iterator.this_arg[4] & 0xF;
+			if (!vht_nss || vht_nss > 8)
+				vht_nss = 1;
 			break;
 
 		/*