1 files changed, 19 insertions, 1 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 02ed6f60629a..88a18ffe2975 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -626,6 +626,9 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
                                 tx->key = NULL;
                         break;
                 case WLAN_CIPHER_SUITE_CCMP:
+                case WLAN_CIPHER_SUITE_CCMP_256:
+                case WLAN_CIPHER_SUITE_GCMP:
+                case WLAN_CIPHER_SUITE_GCMP_256:
                         if (!ieee80211_is_data_present(hdr->frame_control) &&
                             !ieee80211_use_mfp(hdr->frame_control, tx->sta,
                                                tx->skb))
@@ -636,6 +639,9 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
                                         ieee80211_is_mgmt(hdr->frame_control);
                         break;
                 case WLAN_CIPHER_SUITE_AES_CMAC:
+                case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+                case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+                case WLAN_CIPHER_SUITE_BIP_GMAC_256:
                         if (!ieee80211_is_mgmt(hdr->frame_control))
                                 tx->key = NULL;
                         break;
@@ -1011,9 +1017,21 @@ ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)
         case WLAN_CIPHER_SUITE_TKIP:
                 return ieee80211_crypto_tkip_encrypt(tx);
         case WLAN_CIPHER_SUITE_CCMP:
-                return ieee80211_crypto_ccmp_encrypt(tx);
+                return ieee80211_crypto_ccmp_encrypt(
+                        tx, IEEE80211_CCMP_MIC_LEN);
+        case WLAN_CIPHER_SUITE_CCMP_256:
+                return ieee80211_crypto_ccmp_encrypt(
+                        tx, IEEE80211_CCMP_256_MIC_LEN);
         case WLAN_CIPHER_SUITE_AES_CMAC:
                 return ieee80211_crypto_aes_cmac_encrypt(tx);
+        case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+                return ieee80211_crypto_aes_cmac_256_encrypt(tx);
+        case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+        case WLAN_CIPHER_SUITE_BIP_GMAC_256:
+                return ieee80211_crypto_aes_gmac_encrypt(tx);
+        case WLAN_CIPHER_SUITE_GCMP:
+        case WLAN_CIPHER_SUITE_GCMP_256:
+                return ieee80211_crypto_gcmp_encrypt(tx);
         default:
                 return ieee80211_crypto_hw_encrypt(tx);
         }