aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/cfg.c2
-rw-r--r--net/mac80211/chan.c2
-rw-r--r--net/mac80211/ieee80211_i.h2
-rw-r--r--net/mac80211/rc80211_minstrel.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d6b01ad2f7d7..fbcc209687c8 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -191,7 +191,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
191 * receive the key. When wpa_supplicant has roamed 191 * receive the key. When wpa_supplicant has roamed
192 * using FT, it attempts to set the key before 192 * using FT, it attempts to set the key before
193 * association has completed, this rejects that attempt 193 * association has completed, this rejects that attempt
194 * so it will set the key again after assocation. 194 * so it will set the key again after association.
195 * 195 *
196 * TODO: accept the key if we have a station entry and 196 * TODO: accept the key if we have a station entry and
197 * add it to the device after the station. 197 * add it to the device after the station.
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 4c74e8da64b9..ee71bb6f64f7 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -1634,7 +1634,7 @@ int ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,
1634 } 1634 }
1635 break; 1635 break;
1636 case IEEE80211_CHANCTX_WILL_BE_REPLACED: 1636 case IEEE80211_CHANCTX_WILL_BE_REPLACED:
1637 /* TODO: Perhaps the bandwith change could be treated as a 1637 /* TODO: Perhaps the bandwidth change could be treated as a
1638 * reservation itself? */ 1638 * reservation itself? */
1639 ret = -EBUSY; 1639 ret = -EBUSY;
1640 goto out; 1640 goto out;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 146a818e52b5..eb425298fe69 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -131,7 +131,7 @@ enum ieee80211_bss_corrupt_data_flags {
131 * 131 *
132 * These are bss flags that are attached to a bss in the 132 * These are bss flags that are attached to a bss in the
133 * @valid_data field of &struct ieee80211_bss. They show which parts 133 * @valid_data field of &struct ieee80211_bss. They show which parts
134 * of the data structure were recieved as a result of an un-corrupted 134 * of the data structure were received as a result of an un-corrupted
135 * beacon/probe response. 135 * beacon/probe response.
136 */ 136 */
137enum ieee80211_bss_valid_data_flags { 137enum ieee80211_bss_valid_data_flags {
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 2baa7ed8789d..c2b91bf47f6d 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -191,7 +191,7 @@ minstrel_update_stats(struct minstrel_priv *mp, struct minstrel_sta_info *mi)
191 * (1) if any success probabilitiy >= 95%, out of those rates 191 * (1) if any success probabilitiy >= 95%, out of those rates
192 * choose the maximum throughput rate as max_prob_rate 192 * choose the maximum throughput rate as max_prob_rate
193 * (2) if all success probabilities < 95%, the rate with 193 * (2) if all success probabilities < 95%, the rate with
194 * highest success probability is choosen as max_prob_rate */ 194 * highest success probability is chosen as max_prob_rate */
195 if (mrs->probability >= MINSTREL_FRAC(95, 100)) { 195 if (mrs->probability >= MINSTREL_FRAC(95, 100)) {
196 if (mrs->cur_tp >= mi->r[tmp_prob_rate].stats.cur_tp) 196 if (mrs->cur_tp >= mi->r[tmp_prob_rate].stats.cur_tp)
197 tmp_prob_rate = i; 197 tmp_prob_rate = i;