From 31626390b36c83a3fcdc1203d6061f28a8cc17e7 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 8 Feb 2012 19:17:11 +0100
Subject: [PATCH] --- yaml --- r: 287967 b: refs/heads/master c:
 216c57b214bd621335ff698b475f6db2802502dc h: refs/heads/master i:   287965:
 1e6c206ac38c0847030b0317e130f4f179049e9b   287963:
 9eff361e7a8e7a29ec220af63671b750f4b7feac   287959:
 4b54ac621f70bbc46c2d23fc8805d49f929d42b0   287951:
 4dca6c29380879375b01171c5fa64d3222345432   287935:
 76ae5a5aeed636d48c578e4a81b08539222c91d3 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/rate.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);