From 47ff92ae4cf0424396375164e265732040da5082 Mon Sep 17 00:00:00 2001
From: Karl Beldan <karl.beldan@rivierawaves.com>
Date: Mon, 15 Apr 2013 17:09:29 +0200
Subject: [PATCH] --- yaml --- r: 369583 b: refs/heads/master c:
 6bc8312f95f982c0a6f26e87d0a6c299a697ed53 h: refs/heads/master i:   369581:
 215374057831c47eac908199078222ecd84fa7a2   369579:
 a8be22a51c3b5b59ea890cf9c0374f940e59a004   369575:
 79ff37ffc98c10d94cf2be853b134d11aa6cc78c   369567:
 600d6b622a1ae7e2d7e910098fae9ebd05961eba v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fad03740088a..b16a7c663dae 100644
--- 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
index 9ff10b33b711..bc5d8184c489 100644
--- 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;
 }
 
 /**