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;