From 652f7011ba1120b3b9fa61409abc6d7deb3e0d67 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 16 Oct 2010 18:49:15 +0200
Subject: [PATCH] --- yaml --- r: 218431 b: refs/heads/master c:
 5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc h: refs/heads/master i:   218429:
 14bb892f5ff0d2e63f7f1b32a67aeca6600e1d7d   218427:
 d4d29737a15bb9251118d0501b0cd002aec68007   218423:
 152cbba509eec1fa6de7923267d005af4b28515b   218415:
 5baaf70bdd4df590498a276ac474a89e7b0c6e9a   218399:
 f41d4b6659b35615ada327489c8f3a9e560c2749   218367:
 31b73434573625eebdd7febc9a5a7f1793a015be v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/rate.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f84441864226..92effb8decb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae7f953e8afa9b1ce234fd0907183b643cc5ab8
+refs/heads/master: 5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc
diff --git a/trunk/net/mac80211/rate.c b/trunk/net/mac80211/rate.c
index 809cf230d251..33f76993da08 100644
--- a/trunk/net/mac80211/rate.c
+++ b/trunk/net/mac80211/rate.c
@@ -329,6 +329,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
 		 * if needed.
 		 */
 		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+			/* Skip invalid rates */
+			if (info->control.rates[i].idx < 0)
+				break;
 			/* Rate masking supports only legacy rates for now */
 			if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
 				continue;