From: Yingying Tang Date: Wed, 28 Mar 2018 09:15:23 +0000 (+0300) Subject: ath10k: avoid to set WEP key for TDLS peer X-Git-Tag: microblaze-v4.18-rc1~187^2~52^2^2~5 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c3816c9ee12c235dde8f382619a38a5ce86fb548;p=linux-2.6-microblaze.git ath10k: avoid to set WEP key for TDLS peer TDLS peer do not need WEP key. Setting WEP key will lead to TDLS setup failure. Add fix to avoid setting WEP key for TDLS peer. Signed-off-by: Yingying Tang Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index c684d6f803f5..659b23809b47 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2977,7 +2977,7 @@ static int ath10k_station_assoc(struct ath10k *ar, } /* Plumb cached keys only for static WEP */ - if (arvif->def_wep_key_idx != -1) { + if ((arvif->def_wep_key_idx != -1) && (!sta->tdls)) { ret = ath10k_install_peer_wep_keys(arvif, sta->addr); if (ret) { ath10k_warn(ar, "failed to install peer wep keys for vdev %i: %d\n",