---

yaml --- r: 369583 b: refs/heads/master c: 6bc8312 h: refs/heads/master i: 369581: 2153740 369579: a8be22a 369575: 79ff37f 369567: 600d6b6 v: v3
git-mirror · Apr 16, 2013 · 47ff92a · 47ff92a
1 parent 20476b8
commit 47ff92a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fffa4b1c170a3cabc58671495b0ae89ded007199
+refs/heads/master: 6bc8312f95f982c0a6f26e87d0a6c299a697ed53
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
@@ -601,8 +601,8 @@ static inline void ieee80211_rate_set_vht(struct ieee80211_tx_rate *rate,
 					  u8 mcs, u8 nss)
 {
 	WARN_ON(mcs & ~0xF);
-	WARN_ON(nss & ~0x7);
-	rate->idx = (nss << 4) | mcs;
+	WARN_ON((nss - 1) & ~0x7);
+	rate->idx = ((nss - 1) << 4) | mcs;
 }
 
 static inline u8
@@ -614,7 +614,7 @@ ieee80211_rate_get_vht_mcs(const struct ieee80211_tx_rate *rate)
 static inline u8
 ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
 {
-	return rate->idx >> 4;
+	return (rate->idx >> 4) + 1;
 }
 
 /**