aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 7223b4e16752..a5ad2d5bb29b 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -666,6 +666,7 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
666 WLAN_CIPHER_SUITE_WEP104, 666 WLAN_CIPHER_SUITE_WEP104,
667 WLAN_CIPHER_SUITE_TKIP, 667 WLAN_CIPHER_SUITE_TKIP,
668 WLAN_CIPHER_SUITE_CCMP, 668 WLAN_CIPHER_SUITE_CCMP,
669 WLAN_CIPHER_SUITE_CCMP_256,
669 WLAN_CIPHER_SUITE_GCMP, 670 WLAN_CIPHER_SUITE_GCMP,
670 WLAN_CIPHER_SUITE_GCMP_256, 671 WLAN_CIPHER_SUITE_GCMP_256,
671 672
@@ -727,9 +728,9 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
727 * including the schemes) 728 * including the schemes)
728 * 729 *
729 * We start counting ciphers defined by schemes, TKIP, CCMP, 730 * We start counting ciphers defined by schemes, TKIP, CCMP,
730 * GCMP, and GCMP-256 731 * CCMP-256, GCMP, and GCMP-256
731 */ 732 */
732 n_suites = local->hw.n_cipher_schemes + 4; 733 n_suites = local->hw.n_cipher_schemes + 5;
733 734
734 /* check if we have WEP40 and WEP104 */ 735 /* check if we have WEP40 and WEP104 */
735 if (have_wep) 736 if (have_wep)
@@ -744,6 +745,7 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
744 return -ENOMEM; 745 return -ENOMEM;
745 746
746 suites[w++] = WLAN_CIPHER_SUITE_CCMP; 747 suites[w++] = WLAN_CIPHER_SUITE_CCMP;
748 suites[w++] = WLAN_CIPHER_SUITE_CCMP_256;
747 suites[w++] = WLAN_CIPHER_SUITE_TKIP; 749 suites[w++] = WLAN_CIPHER_SUITE_TKIP;
748 suites[w++] = WLAN_CIPHER_SUITE_GCMP; 750 suites[w++] = WLAN_CIPHER_SUITE_GCMP;
749 suites[w++] = WLAN_CIPHER_SUITE_GCMP_256; 751 suites[w++] = WLAN_CIPHER_SUITE_GCMP_256;