Commit 2d3d0a88 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: return success in set_default_key for WPA/WPA2

When testing wpa_supplicant with 'nl80211' driver to connect
to an AP with WPA/WPA2 security, we notice the followings:

1) add_key is called firstly with the key from cfg80211
2) set_defaut_key is called next

set_default_key() is specific to WEP keys and should not be
called in case of WPA/WPA2 security. The set_default_key()
won't be called if wpa_supplicant uses "-Dwext" option,
but it's been called if "-Dnl80211" option is specified.

We can fix this issue by adding a check to return from
set_default_key() if WEP key is not configured.
Signed-off-by: default avatarAmitkumar Karwar <>
Signed-off-by: default avatarYogesh Ashok Powar <>
Signed-off-by: default avatarMarc Yang <>
Signed-off-by: default avatarBing Zhao <>
Signed-off-by: default avatarJohn W. Linville <>
parent f4263c98
......@@ -228,6 +228,10 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
int ret;
/* Return if WEP key not configured */
if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED)
return 0;
ret = mwifiex_set_encode(priv, NULL, 0, key_index, 0);
wiphy_dbg(wiphy, "info: set default Tx key index\n");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment