diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-02-13 09:53:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-02-13 09:53:28 +0000 |
| commit | 31718416e6aabd70c24275744805c84c66ab9406 (patch) | |
| tree | fb986d843a743bf700973bb674fcd3dc73fe03c3 | |
| parent | 4663d424a356228e78128bed5b66a37feba7cd8b (diff) | |
| download | upstream-31718416e6aabd70c24275744805c84c66ab9406.tar.gz upstream-31718416e6aabd70c24275744805c84c66ab9406.tar.bz2 upstream-31718416e6aabd70c24275744805c84c66ab9406.zip | |
mac80211: add some small fixes for minstrel_ht CCK support
SVN-Revision: 35576
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 18 |
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] || |