diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-02-26 22:54:45 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-26 22:54:45 +0100 |
| commit | 64463da913bc8f791980ba28d93ac5e716ab9cc5 (patch) | |
| tree | cf958678f7cf0b615a52356beb2d18240424ab4a /net | |
| parent | mwl8k: convert to new station add/remove callbacks (diff) | |
| parent | iwlwifi: sanity check before counting number of tfds can be free (diff) | |
| download | linux-64463da913bc8f791980ba28d93ac5e716ab9cc5.tar.xz linux-64463da913bc8f791980ba28d93ac5e716ab9cc5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
net/mac80211/rate.c
Diffstat (limited to 'net')
| -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); /* |