mac80111: Add GCMP and GCMP-256 ciphers

This allows mac80211 to configure GCMP and GCMP-256 to the driver and
also use software-implementation within mac80211 when the driver does
not support this with hardware accelaration.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
[remove a spurious newline]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ea6b82ac4f0b..7223b4e16752 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -666,6 +666,8 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                 WLAN_CIPHER_SUITE_WEP104,
                 WLAN_CIPHER_SUITE_TKIP,
                 WLAN_CIPHER_SUITE_CCMP,
+                WLAN_CIPHER_SUITE_GCMP,
+                WLAN_CIPHER_SUITE_GCMP_256,
 
                 /* keep last -- depends on hw flags! */
                 WLAN_CIPHER_SUITE_AES_CMAC
@@ -724,9 +726,10 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                 /* Driver specifies cipher schemes only (but not cipher suites
                  * including the schemes)
                  *
-                 * We start counting ciphers defined by schemes, TKIP and CCMP
+                 * We start counting ciphers defined by schemes, TKIP, CCMP,
+                 * GCMP, and GCMP-256
                  */
-                n_suites = local->hw.n_cipher_schemes + 2;
+                n_suites = local->hw.n_cipher_schemes + 4;
 
                 /* check if we have WEP40 and WEP104 */
                 if (have_wep)
@@ -742,6 +745,8 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
 
                 suites[w++] = WLAN_CIPHER_SUITE_CCMP;
                 suites[w++] = WLAN_CIPHER_SUITE_TKIP;
+                suites[w++] = WLAN_CIPHER_SUITE_GCMP;
+                suites[w++] = WLAN_CIPHER_SUITE_GCMP_256;
 
                 if (have_wep) {
                         suites[w++] = WLAN_CIPHER_SUITE_WEP40;