aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-14 22:30:54 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-14 22:30:54 -0800
commit5ecccb74dc91e22496a142b103ba958f93c29275 (patch)
treeb560b8974ec0e0478492d60753d45d8aea9db9b0 /net/mac80211
parentf6f223039c0d0683bdea1eabd35b309e10311a60 (diff)
parent3d0beb921fa34ebf8b13e206e5473329b14deb83 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/rate.c
Diffstat (limited to 'net/mac80211')
-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 99ab24cc978..0b299d236fa 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -303,6 +303,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;
+
ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
/*