aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-08 18:43:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-02-08 18:43:21 +0000
commit2808fd3f2e0061f8135e21b0fe33024d010cda72 (patch)
tree7f602ac38229720a03eae08ff8d61c84544b9a29
parent8d8c3a947919b4b5f42a9f38b335e6d61b509e89 (diff)
downloadupstream-2808fd3f2e0061f8135e21b0fe33024d010cda72.tar.gz
upstream-2808fd3f2e0061f8135e21b0fe33024d010cda72.tar.bz2
upstream-2808fd3f2e0061f8135e21b0fe33024d010cda72.zip
mac80211: fix a potential rate control related crash
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30388 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 83edd7e6b4..b8cd51a09d 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -253,3 +253,14 @@
WLAN_STA_CLEAR_PS_FILT,
WLAN_STA_MFP,
WLAN_STA_BLOCK_BA,
+--- a/net/mac80211/rate.h
++++ b/net/mac80211/rate.h
+@@ -37,7 +37,7 @@ static inline void rate_control_tx_statu
+ 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);