mwifiex: cfg80211 set_default_mgmt_key handler

Previously device used to start using IGTK key as Tx key as soon as it
gets downloaded in add_key(). This patch implements set_default_mgmt_key
handler. We will update Tx key ID in set_default_mgmt_key().

Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index c7f2faa81921818462294a50d732362c01b82b8a..39ce76ad00bc052d9dc99d5f1162842dc2dc2f3a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -483,6 +483,29 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
        return 0;
 }
 
+/*
+ * CFG802.11 operation handler to set default mgmt key.
+ */
+static int
+mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
+                                     struct net_device *netdev,
+                                     u8 key_index)
+{
+       struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
+       struct mwifiex_ds_encrypt_key encrypt_key;
+
+       wiphy_dbg(wiphy, "set default mgmt key, key index=%d\n", key_index);
+
+       memset(&encrypt_key, 0, sizeof(struct mwifiex_ds_encrypt_key));
+       encrypt_key.key_len = WLAN_KEY_LEN_CCMP;
+       encrypt_key.key_index = key_index;
+       encrypt_key.is_igtk_def_key = true;
+       eth_broadcast_addr(encrypt_key.mac_addr);
+
+       return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                               HostCmd_ACT_GEN_SET, true, &encrypt_key, true);
+}
+
 /*
  * This function sends domain information to the firmware.
  *
@@ -4082,6 +4105,7 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
        .leave_ibss = mwifiex_cfg80211_leave_ibss,
        .add_key = mwifiex_cfg80211_add_key,
        .del_key = mwifiex_cfg80211_del_key,
+       .set_default_mgmt_key = mwifiex_cfg80211_set_default_mgmt_key,
        .mgmt_tx = mwifiex_cfg80211_mgmt_tx,
        .mgmt_frame_register = mwifiex_cfg80211_mgmt_frame_register,
        .remain_on_channel = mwifiex_cfg80211_remain_on_channel,

diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 18aa5256e88bb1f3e9c546627ce9daa4c2552ee6..4b1894b4757ffe654d409828c665e1df76668ca3 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -78,6 +78,7 @@ enum KEY_TYPE_ID {
        KEY_TYPE_ID_AES,
        KEY_TYPE_ID_WAPI,
        KEY_TYPE_ID_AES_CMAC,
+       KEY_TYPE_ID_AES_CMAC_DEF,
 };
 
 #define WPA_PN_SIZE            8

diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h
index 70429815ff53e96a8c713c6c4844f61c03637a3e..536ab834b12625f8ac7ccce1b309b465f82db31b 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/ioctl.h
+++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h
@@ -260,6 +260,7 @@ struct mwifiex_ds_encrypt_key {
        u8 is_igtk_key;
        u8 is_current_wep_key;
        u8 is_rx_seq_valid;
+       u8 is_igtk_def_key;
 };
 
 struct mwifiex_power_cfg {

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 49048b41fd3693469e03da6043a7d69cf28ba5ae..2a162c33d271a58adf0c54b935de9063c3f6ddd3 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -598,6 +598,11 @@ static int mwifiex_set_aes_key_v2(struct mwifiex_private *priv,
                memcpy(km->key_param_set.key_params.cmac_aes.key,
                       enc_key->key_material, enc_key->key_len);
                len += sizeof(struct mwifiex_cmac_aes_param);
+       } else if (enc_key->is_igtk_def_key) {
+               mwifiex_dbg(adapter, INFO,
+                           "%s: Set CMAC default Key index\n", __func__);
+               km->key_param_set.key_type = KEY_TYPE_ID_AES_CMAC_DEF;
+               km->key_param_set.key_idx = enc_key->key_index & KEY_INDEX_MASK;
        } else {
                mwifiex_dbg(adapter, INFO,
                            "%s: Set AES Key\n", __func__);