mac80211: fix a crash in legacy minstrel when no STA exists
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37342
This commit is contained in:
parent
93cb862260
commit
a5e70c13f8
1 changed files with 19 additions and 0 deletions
|
@ -779,3 +779,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cfg80211_sme_connect(struct wireless_dev *wdev,
|
static int cfg80211_sme_connect(struct wireless_dev *wdev,
|
||||||
|
--- a/net/mac80211/rc80211_minstrel.c
|
||||||
|
+++ b/net/mac80211/rc80211_minstrel.c
|
||||||
|
@@ -290,7 +290,7 @@ minstrel_get_rate(void *priv, struct iee
|
||||||
|
struct minstrel_rate *msr, *mr;
|
||||||
|
unsigned int ndx;
|
||||||
|
bool mrr_capable;
|
||||||
|
- bool prev_sample = mi->prev_sample;
|
||||||
|
+ bool prev_sample;
|
||||||
|
int delta;
|
||||||
|
int sampling_ratio;
|
||||||
|
|
||||||
|
@@ -314,6 +314,7 @@ minstrel_get_rate(void *priv, struct iee
|
||||||
|
(mi->sample_count + mi->sample_deferred / 2);
|
||||||
|
|
||||||
|
/* delta < 0: no sampling required */
|
||||||
|
+ prev_sample = mi->prev_sample;
|
||||||
|
mi->prev_sample = false;
|
||||||
|
if (delta < 0 || (!mrr_capable && prev_sample))
|
||||||
|
return;
|
||||||
|
|
Loading…
Reference in a new issue