88b9de105c
mac80211: do not call rate control .tx_status before .rate_init mwifiex: clear previous security setting during association ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status ath9k_hw: prevent writes to const data on AR9160 rt2x00: fix a possible NULL pointer dereference iwlwifi: fix key removal mac80211: zero initialize count field in ieee80211_tx_rate mac80211: Fix a warning on changing to monitor mode from STA brcm80211: smac: fix endless retry of A-MPDU transmissions brcm80211: smac: only print block-ack timeout message at trace level
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 216c57b214bd621335ff698b475f6db2802502dc Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Wed, 8 Feb 2012 19:17:11 +0100
|
|
Subject: [PATCH] mac80211: do not call rate control .tx_status before
|
|
.rate_init
|
|
|
|
Most rate control implementations assume .get_rate and .tx_status are only
|
|
called once the per-station data has been fully initialized.
|
|
minstrel_ht crashes if this assumption is violated.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
Tested-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
---
|
|
net/mac80211/rate.h | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
|
|
index 2b83f32..80cfc00 100644
|
|
--- a/net/mac80211/rate.h
|
|
+++ b/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);
|
|
--
|
|
1.7.4.4
|
|
|