summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-25 21:12:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-25 21:12:28 +0000
commit1da648ca46b0a0cc82de8ef2bfe34b792b6fb687 (patch)
treef31d3262925f20a1ea63259c2a13285de4c5707f /package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch
parentf17e4f81ac1f477e1cc6db10c92b3219e8f2f049 (diff)
mac80211: update to wireless-testing 2011-03-24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26293 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch')
-rw-r--r--package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch b/package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch
deleted file mode 100644
index 942bf9208..000000000
--- a/package/mac80211/patches/580-mac80211_fix_minstrel_ht_crash.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -659,18 +659,14 @@ minstrel_ht_update_caps(void *priv, stru
- struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
- struct ieee80211_local *local = hw_to_local(mp->hw);
- u16 sta_cap = sta->ht_cap.cap;
-+ int n_supported = 0;
- int ack_dur;
- int stbc;
- int i;
-
- /* fall back to the old minstrel for legacy stations */
-- if (!sta->ht_cap.ht_supported) {
-- msp->is_ht = false;
-- memset(&msp->legacy, 0, sizeof(msp->legacy));
-- msp->legacy.r = msp->ratelist;
-- msp->legacy.sample_table = msp->sample_table;
-- return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
-- }
-+ if (!sta->ht_cap.ht_supported)
-+ goto use_legacy;
-
- BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) !=
- MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS);
-@@ -725,7 +721,22 @@ minstrel_ht_update_caps(void *priv, stru
-
- mi->groups[i].supported =
- mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
-+
-+ if (mi->groups[i].supported)
-+ n_supported++;
- }
-+
-+ if (!n_supported)
-+ goto use_legacy;
-+
-+ return;
-+
-+use_legacy:
-+ msp->is_ht = false;
-+ memset(&msp->legacy, 0, sizeof(msp->legacy));
-+ msp->legacy.r = msp->ratelist;
-+ msp->legacy.sample_table = msp->sample_table;
-+ return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
- }
-
- static void