diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-15 07:30:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-15 07:30:54 +0100 |
| commit | 5ecccb74dc91e22496a142b103ba958f93c29275 (patch) | |
| tree | b560b8974ec0e0478492d60753d45d8aea9db9b0 /net/mac80211/rate.c | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| download | linux-5ecccb74dc91e22496a142b103ba958f93c29275.tar.xz linux-5ecccb74dc91e22496a142b103ba958f93c29275.zip | |
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/rate.c')
| -rw-r--r-- | net/mac80211/rate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 99ab24cc9783..0b299d236fa1 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); /* |