Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chromeos/compat-wireless/net/mac80211/rate.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/compat-wireless/net/mac80211/rate.c
diff --git a/chromeos/compat-wireless/net/mac80211/rate.c b/chromeos/compat-wireless/net/mac80211/rate.c
index 11dfd51f3779464994a7328387360d29d680b57b..fc904b5771fdf80e98fb925ac999327f9f7fff8d 100644
--- a/chromeos/compat-wireless/net/mac80211/rate.c
+++ b/chromeos/compat-wireless/net/mac80211/rate.c
@@ -328,6 +328,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
* if needed.
*/
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+ /* Skip invalid rates */
+ if (info->control.rates[i].idx < 0)
+ break;
/* Rate masking supports only legacy rates for now */
if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
continue;
@@ -460,7 +463,7 @@ void ieee80211_cqm_bitrate_notify(struct ieee80211_sub_if_data *sdata)
if (!netif_running(sdata->dev) ||
sdata->vif.type != NL80211_IFTYPE_STATION)
return;
-
+
/*
* Skip sending a notification if a the state was cleared
* after the workproc was scheduled (e.g, if userspace

Powered by Google App Engine
This is Rietveld 408576698