Amitkumar Karwar <[email protected]> writes:

> From: Ganapathi Bhat <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Amitkumar Karwar <[email protected]>
> ---
> Changes in v2: v1 had a dummy handler. v2 addresses a corner case problem
> pointed by Jouni in which AP may send frames encrypted with new key when some
> of the stations are still using old key.
> ---
>  drivers/net/wireless/marvell/mwifiex/cfg80211.c | 25 
> +++++++++++++++++++++++++
>  drivers/net/wireless/marvell/mwifiex/fw.h       |  1 +
>  drivers/net/wireless/marvell/mwifiex/ioctl.h    |  1 +
>  drivers/net/wireless/marvell/mwifiex/sta_cmd.c  |  5 +++++
>  4 files changed, 32 insertions(+)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c 
> b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> index 0a03d3f..33e7a74 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> @@ -484,6 +484,30 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct 
> net_device *netdev,
>  }
>  
>  /*
> + * 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;
> +     const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

This should be static const, but...

> +     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;
> +     ether_addr_copy(encrypt_key.mac_addr, bc_mac);

...can't you use eth_broadcast_addr() here?

-- 
Kalle Valo

Reply via email to