aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-02-13 09:53:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-02-13 09:53:28 +0000
commitc403c980f55917cb83253dc125234d47de6aaf3c (patch)
tree7f0d9236a7fe5c3b1018dce80d15121bc5579da7 /package/mac80211
parentce3c164477ea9526515a2c9937b599607c9c78ba (diff)
downloadupstream-c403c980f55917cb83253dc125234d47de6aaf3c.tar.gz
upstream-c403c980f55917cb83253dc125234d47de6aaf3c.tar.bz2
upstream-c403c980f55917cb83253dc125234d47de6aaf3c.zip
mac80211: add some small fixes for minstrel_ht CCK support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35576 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/300-pending_work.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index a0ddf42ad2..3cba6e42ae 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -2721,13 +2721,13 @@
+ CCK_ACK_DURATION(55, _short), \
+ CCK_ACK_DURATION(110, _short)
+
-+#define CCK_GROUP \
-+ { \
-+ .streams = 0, \
-+ .duration = { \
-+ CCK_DURATION_LIST(false), \
-+ CCK_DURATION_LIST(true) \
-+ } \
++#define CCK_GROUP \
++ [MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS] = { \
++ .streams = 0, \
++ .duration = { \
++ CCK_DURATION_LIST(false), \
++ CCK_DURATION_LIST(true) \
++ } \
+ }
+
/*
@@ -2763,7 +2763,7 @@
+ } else {
+ group = MINSTREL_CCK_GROUP;
+
-+ for (idx = 0; idx <= ARRAY_SIZE(mp->cck_rates); idx++)
++ for (idx = 0; idx < ARRAY_SIZE(mp->cck_rates); idx++)
+ if (rate->idx == mp->cck_rates[idx])
+ break;
+
@@ -2822,7 +2822,7 @@
return false;
- return !!(rate->flags & IEEE80211_TX_RC_MCS);
-+ if (rate->flags & IEEE80211_TX_RC_MCS);
++ if (rate->flags & IEEE80211_TX_RC_MCS)
+ return true;
+
+ return rate->idx == mp->cck_rates[0] ||