diff --git a/[refs] b/[refs]
index 4ea27b7fd224..3eb69e72fb46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4d57adb727ec7c34020390eeb0eeb9e0a2959bc
+refs/heads/master: 3c384053ce4cb1949f5575c28e30e6ceea8cb39b
diff --git a/trunk/net/mac80211/rate.h b/trunk/net/mac80211/rate.h
index 669dddd40521..998cf7a935b6 100644
--- a/trunk/net/mac80211/rate.h
+++ b/trunk/net/mac80211/rate.h
@@ -44,6 +44,10 @@ static inline void rate_control_tx_status(struct ieee80211_local *local,
 	struct rate_control_ref *ref = local->rate_ctrl;
 	struct ieee80211_sta *ista = &sta->sta;
 	void *priv_sta = sta->rate_ctrl_priv;
+
+	if (!ref)
+		return;
+
 	ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
 }