diff --git a/[refs] b/[refs]
index 7ae115596ef4..c1344a9b7bbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b5a433ae5348c23caa0b5f0a2fca7c342acb200
+refs/heads/master: 216c57b214bd621335ff698b475f6db2802502dc
diff --git a/trunk/net/mac80211/rate.h b/trunk/net/mac80211/rate.h
index 2b83f32144fd..80cfc006dd74 100644
--- a/trunk/net/mac80211/rate.h
+++ b/trunk/net/mac80211/rate.h
@@ -41,7 +41,7 @@ static inline void rate_control_tx_status(struct ieee80211_local *local,
 	struct ieee80211_sta *ista = &sta->sta;
 	void *priv_sta = sta->rate_ctrl_priv;
 
-	if (!ref)
+	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
 		return;
 
 	ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);