From 62a2dd0a0d9b0ac5806b37503c7a4f2fdfe04a95 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 1 Feb 2012 10:42:11 +0300 Subject: [PATCH] --- yaml --- r: 290363 b: refs/heads/master c: 910570b5f4dbf75b73389010704ca6442a767a41 h: refs/heads/master i: 290361: 3fff2a68d139a9991ef82668e2c0328916044c00 290359: 892a0d97ac9ffa406c6dd2517f30d589ccdc301d v: v3 --- [refs] | 2 +- trunk/net/mac80211/rate.c | 2 +- trunk/net/wireless/nl80211.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a57ca55409b..9c93753c3074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d486a5b4996d2fffd10098725781f2c5690774bc +refs/heads/master: 910570b5f4dbf75b73389010704ca6442a767a41 diff --git a/trunk/net/mac80211/rate.c b/trunk/net/mac80211/rate.c index 3fef26d8898a..22fc28e9026e 100644 --- a/trunk/net/mac80211/rate.c +++ b/trunk/net/mac80211/rate.c @@ -324,7 +324,7 @@ static bool rate_idx_match_mcs_mask(struct ieee80211_tx_rate *rate, rbit = rate->idx % 8; /* sanity check */ - if (ridx < 0 || ridx > IEEE80211_HT_MCS_MASK_LEN) + if (ridx < 0 || ridx >= IEEE80211_HT_MCS_MASK_LEN) return false; /* See whether the selected rate or anything below it is allowed. */ diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index f1681e2c5949..fe2747653564 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -5410,7 +5410,7 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband, rbit = BIT(rates[i] % 8); /* check validity */ - if ((ridx < 0) || (ridx > IEEE80211_HT_MCS_MASK_LEN)) + if ((ridx < 0) || (ridx >= IEEE80211_HT_MCS_MASK_LEN)) return false; /* check availability */