| From 6c6d7d33ec42e6b67d4cdce883bcfa42cc91b4e3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 11 Jun 2018 14:05:11 +0300 |
| Subject: iwlwifi: mvm: Allow TKIP for AP mode |
| |
| From: Ilan Peer <ilan.peer@intel.com> |
| |
| [ Upstream commit 6f3df8c1192c873a6ad9a76328920f6f85af90a8 ] |
| |
| Support for setting keys for TKIP cipher suite was mistakenly removed |
| for AP mode. Fix this. |
| |
| Fixes: 85aeb58cec1a ("iwlwifi: mvm: Enable security on new TX API") |
| Signed-off-by: Ilan Peer <ilan.peer@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c |
| index 18db1ed92d9b0..04ea516bddcc0 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c |
| @@ -3133,10 +3133,6 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm, |
| |
| switch (keyconf->cipher) { |
| case WLAN_CIPHER_SUITE_TKIP: |
| - if (vif->type == NL80211_IFTYPE_AP) { |
| - ret = -EINVAL; |
| - break; |
| - } |
| addr = iwl_mvm_get_mac_addr(mvm, vif, sta); |
| /* get phase 1 key from mac80211 */ |
| ieee80211_get_key_rx_seq(keyconf, 0, &seq); |
| -- |
| 2.20.1 |
| |