From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 15 Jul 2013 12:36:00 +0000 (+0000)
Subject: mac80211: fix a crash in legacy minstrel when no STA exists
X-Git-Url: https://git.archive.openwrt.org/luci/splash?a=commitdiff_plain;h=c455906138b8e36a1f6e75a9fc7a7a4fe0006e7b;p=12.09%2Fopenwrt.git

mac80211: fix a crash in legacy minstrel when no STA exists

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r37342

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37343 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index b35f5c6..c5a61bb 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -779,3 +779,22 @@
  }
  
  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;