aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGanapathi Bhat <gbhat@marvell.com>2017-02-03 08:00:22 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 08:00:16 -0400
commit9291cabe094b2504c4d14c4ed0b77c4edfb538e7 (patch)
tree7d7e9280b9507433d28e21847446cf16f2befce5
parentdcdeaa74334299fd98c29703aa82deec3ae6b37a (diff)
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sta_ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index 644f3a248741..1532ac9cee0b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -1159,8 +1159,6 @@ int mwifiex_set_encode(struct mwifiex_private *priv, struct key_params *kp,
1159 encrypt_key.is_rx_seq_valid = true; 1159 encrypt_key.is_rx_seq_valid = true;
1160 } 1160 }
1161 } else { 1161 } else {
1162 if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP)
1163 return 0;
1164 encrypt_key.key_disable = true; 1162 encrypt_key.key_disable = true;
1165 if (mac_addr) 1163 if (mac_addr)
1166 memcpy(encrypt_key.mac_addr, mac_addr, ETH_ALEN); 1164 memcpy(encrypt_key.mac_addr, mac_addr, ETH_ALEN);