lkml.org 
[lkml]   [2013]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 039/102] mac80211/minstrel_ht: fix cck rate sampling
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit 1cd158573951f737fbc878a35cb5eb47bf9af3d5 upstream.

    The CCK group needs special treatment to set the right flags and rate
    index. Add this missing check to prevent setting broken rates for tx
    packets.

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/rc80211_minstrel_ht.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/net/mac80211/rc80211_minstrel_ht.c
    +++ b/net/mac80211/rc80211_minstrel_ht.c
    @@ -804,10 +804,18 @@ minstrel_ht_get_rate(void *priv, struct

    sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];
    info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
    + rate->count = 1;
    +
    + if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
    + int idx = sample_idx % ARRAY_SIZE(mp->cck_rates);
    + rate->idx = mp->cck_rates[idx];
    + rate->flags = 0;
    + return;
    + }
    +
    rate->idx = sample_idx % MCS_GROUP_RATES +
    (sample_group->streams - 1) * MCS_GROUP_RATES;
    rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;
    - rate->count = 1;
    }

    static void



    \
     
     \ /
      Last update: 2013-08-09 05:01    [W:4.081 / U:0.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site