summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-02-26 16:54:45 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-26 16:54:45 -0500
commit64463da913bc8f791980ba28d93ac5e716ab9cc5 (patch)
treecf958678f7cf0b615a52356beb2d18240424ab4a /net
parent4a6967b88af02eebeedfbb91bc09160750225bb5 (diff)
parenta120e912eb51e347f36c71b60a1d13af74d30e83 (diff)
downloadlinux-64463da913bc8f791980ba28d93ac5e716ab9cc5.tar.gz
linux-64463da913bc8f791980ba28d93ac5e716ab9cc5.tar.bz2
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.c3
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);
/*