aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-08 09:02:03 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-12 14:22:11 -0400
commitde5036aae635b7ea5a920e56fcf074a333b325ca (patch)
treec5a0a0aaa68f8e886a83f29868d8d2e2c467eaf2 /net
parent4db2c9aeb28762ea7416122d03a7e5c8d87eb924 (diff)
mac80211: move misplaced comment
Looks like some changes in this area moved the code but not the comment that belongs to the code, move it to the right place. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 5c2ba80c2932..059a4eba9fec 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3274,6 +3274,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
3274 3274
3275 ifmgd->beacon_crc_valid = false; 3275 ifmgd->beacon_crc_valid = false;
3276 3276
3277 /*
3278 * IEEE802.11n does not allow TKIP/WEP as pairwise ciphers in HT mode.
3279 * We still associate in non-HT mode (11a/b/g) if any one of these
3280 * ciphers is configured as pairwise.
3281 * We can set this to true for non-11n hardware, that'll be checked
3282 * separately along with the peer capabilities.
3283 */
3277 for (i = 0; i < req->crypto.n_ciphers_pairwise; i++) 3284 for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
3278 if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 || 3285 if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||
3279 req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP || 3286 req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||
@@ -3302,13 +3309,6 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
3302 } else 3309 } else
3303 ifmgd->ap_smps = ifmgd->req_smps; 3310 ifmgd->ap_smps = ifmgd->req_smps;
3304 3311
3305 /*
3306 * IEEE802.11n does not allow TKIP/WEP as pairwise ciphers in HT mode.
3307 * We still associate in non-HT mode (11a/b/g) if any one of these
3308 * ciphers is configured as pairwise.
3309 * We can set this to true for non-11n hardware, that'll be checked
3310 * separately along with the peer capabilities.
3311 */
3312 assoc_data->capability = req->bss->capability; 3312 assoc_data->capability = req->bss->capability;
3313 assoc_data->wmm_used = bss->wmm_used; 3313 assoc_data->wmm_used = bss->wmm_used;
3314 assoc_data->supp_rates = bss->supp_rates; 3314 assoc_data->supp_rates = bss->supp_rates;