summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-14 11:56:38 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-14 11:56:38 -0800
commit3d0beb921fa34ebf8b13e206e5473329b14deb83 (patch)
treeb7f121166e835da5e61587ce7bd18b4091b1b7be /net
parent5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 (diff)
parent5affcd6ba2036b59a4dee3f0576ae3584e92e4f1 (diff)
downloadop-kernel-dev-3d0beb921fa34ebf8b13e206e5473329b14deb83.zip
op-kernel-dev-3d0beb921fa34ebf8b13e206e5473329b14deb83.tar.gz
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index b9007f8..12a2bff 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -245,6 +245,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
info->control.rates[i].count = 1;
}
+ if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+ return;
+
if (sta && sdata->force_unicast_rateidx > -1) {
info->control.rates[0].idx = sdata->force_unicast_rateidx;
} else {
OpenPOWER on IntegriCloud