diff --git a/[refs] b/[refs]
index e0d1e03ddbe0..55a403d5f084 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fafaf31bf9f965d91462ee115e27ef6c262b74ea
+refs/heads/master: 5affcd6ba2036b59a4dee3f0576ae3584e92e4f1
diff --git a/trunk/net/mac80211/rate.c b/trunk/net/mac80211/rate.c
index b9007f80cb92..12a2bff7dcdb 100644
--- a/trunk/net/mac80211/rate.c
+++ b/trunk/net/mac80211/rate.c
@@ -245,6 +245,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
 		info->control.rates[i].count = 1;
 	}
 
+	if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+		return;
+
 	if (sta && sdata->force_unicast_rateidx > -1) {
 		info->control.rates[0].idx = sdata->force_unicast_rateidx;
 	} else {