diff --git a/[refs] b/[refs]
index 4e1081b13828..8b909b9bae5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42bc0c9716c456a9686fcd4ee5cf115b992b9952
+refs/heads/master: 2cfc6fc584a65db87935ca4e4d5e1ad89d5192ee
diff --git a/trunk/net/mac80211/rate.h b/trunk/net/mac80211/rate.h
index 5fc3135a6b45..fbb1efdc4d04 100644
--- a/trunk/net/mac80211/rate.h
+++ b/trunk/net/mac80211/rate.h
@@ -37,7 +37,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);