summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGanapathi Bhat <gbhat@marvell.com>2017-02-03 18:30:22 +0530
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:17:04 +0100
commit9bf8b28e23516dfc02ec440755a84a79b269e18e (patch)
tree08401b2a6ac4bfaa601a727061942c042975ef92 /drivers
parentecc8fadef567c21934452fcfc076dd497a711599 (diff)
downloadlinux-stable-9bf8b28e23516dfc02ec440755a84a79b269e18e.tar.gz
linux-stable-9bf8b28e23516dfc02ec440755a84a79b269e18e.tar.bz2
linux-stable-9bf8b28e23516dfc02ec440755a84a79b269e18e.zip
mwifiex: Avoid skipping WEP key deletion for AP
commit a5b60de6972decc6b50a39abb376077c3c3621c8 upstream. This patch fixes the issue specific to AP. AP is started with WEP security and external station is connected to it. Data path works in this case. Now if AP is restarted with WPA/WPA2 security, station is able to connect but ping fails. Driver skips the deletion of WEP keys if interface type is AP. Removing that redundant check resolves the issue. Fixes: e57f1734d87a ("mwifiex: add key material v2 support") Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mwifiex/sta_ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index c73470569e6d..da7f7d2fcb1f 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -1082,8 +1082,6 @@ int mwifiex_set_encode(struct mwifiex_private *priv, struct key_params *kp,
encrypt_key.is_rx_seq_valid = true;
}
} else {
- if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP)
- return 0;
encrypt_key.key_disable = true;
if (mac_addr)
memcpy(encrypt_key.mac_addr, mac_addr, ETH_ALEN);