diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-27 17:35:07 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-27 17:35:07 -0700 |
commit | 0870352bc6e0dee485c86a0c99dd60e7089c8917 (patch) | |
tree | 0c6259b663350594bff4f128e12f8bd6d4c769c1 /net/mac80211/rate.c | |
parent | c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da (diff) | |
parent | 8a5117d80fe93de5df5b56480054f7df1fd20755 (diff) | |
download | op-kernel-dev-0870352bc6e0dee485c86a0c99dd60e7089c8917.zip op-kernel-dev-0870352bc6e0dee485c86a0c99dd60e7089c8917.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rate.c')
-rw-r--r-- | net/mac80211/rate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 3fa7ab2..4641f00 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -219,10 +219,12 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, info->control.rates[i].count = 1; } - if (sta && sdata->force_unicast_rateidx > -1) + if (sta && sdata->force_unicast_rateidx > -1) { info->control.rates[0].idx = sdata->force_unicast_rateidx; - else + } else { ref->ops->get_rate(ref->priv, ista, priv_sta, txrc); + info->flags |= IEEE80211_TX_INTFL_RCALGO; + } /* * try to enforce the maximum rate the user wanted |