mac80111: Add BIP-CMAC-256 cipher

This allows mac80211 to configure BIP-CMAC-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>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a5ad2d5bb29b..053a17c5023a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -671,7 +671,8 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                 WLAN_CIPHER_SUITE_GCMP_256,
 
                 /* keep last -- depends on hw flags! */
-                WLAN_CIPHER_SUITE_AES_CMAC
+                WLAN_CIPHER_SUITE_AES_CMAC,
+                WLAN_CIPHER_SUITE_BIP_CMAC_256,
         };
 
         if (local->hw.flags & IEEE80211_HW_SW_CRYPTO_CONTROL ||
@@ -710,7 +711,7 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                 local->hw.wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
 
                 if (!have_mfp)
-                        local->hw.wiphy->n_cipher_suites--;
+                        local->hw.wiphy->n_cipher_suites -= 2;
 
                 if (!have_wep) {
                         local->hw.wiphy->cipher_suites += 2;
@@ -736,9 +737,9 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                 if (have_wep)
                         n_suites += 2;
 
-                /* check if we have AES_CMAC */
+                /* check if we have AES_CMAC, BIP-CMAC-256 */
                 if (have_mfp)
-                        n_suites++;
+                        n_suites += 2;
 
                 suites = kmalloc(sizeof(u32) * n_suites, GFP_KERNEL);
                 if (!suites)
@@ -755,8 +756,10 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
                         suites[w++] = WLAN_CIPHER_SUITE_WEP104;
                 }
 
-                if (have_mfp)
+                if (have_mfp) {
                         suites[w++] = WLAN_CIPHER_SUITE_AES_CMAC;
+                        suites[w++] = WLAN_CIPHER_SUITE_BIP_CMAC_256;
+                }
 
                 for (r = 0; r < local->hw.n_cipher_schemes; r++)
                         suites[w++] = cs[r].cipher;