summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyeong Kim <kyeongk@nvidia.com>2013-12-11 11:03:52 -0800
committerRiham Haidar <rhaidar@nvidia.com>2014-01-24 15:14:38 -0800
commitea93d0d644506d766c351085b60a09a2c07dfa4b (patch)
treeaa93b2bd0f7cd4cf58608a22404f63c94dfbb1e6
parent7efc53950dbdbda13b0b4f7b8fe9a30ff4ed2e8f (diff)
bcmdhd: key installation timing fix
In case 43241 is a GO and it RECEIVES 4/4 key msg, so dhd_wait_pend8021x() is not required for GO mode, hence we have skipped this for AP/GO mode. Bug 1392645 Change-Id: Icb1f86c5bfcb2afbd7e26fca9f75d73598d4ca07 Signed-off-by: Kyeong Kim <kyeongk@nvidia.com> Reviewed-on: http://git-master/r/344360 Reviewed-on: http://git-master/r/358430 (cherry picked from commit 0acf883349f609ca82f49a1b537d4e9f476f6e64) Reviewed-on: http://git-master/r/358908 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
-rwxr-xr-xdrivers/net/wireless/bcmdhd/wl_cfg80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 180360bce785..d07de22a342d 100755
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -3711,7 +3711,8 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
}
swap_key_from_BE(&key);
/* need to guarantee EAPOL 4/4 send out before set key */
- dhd_wait_pend8021x(dev);
+ if (mode != WL_MODE_AP)
+ dhd_wait_pend8021x(dev);
err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key),
wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync);
if (unlikely(err)) {