]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
iwlwifi: mvm: Allow TKIP for AP mode
authorIlan Peer <ilan.peer@intel.com>
Mon, 11 Jun 2018 11:05:11 +0000 (14:05 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:16:54 +0000 (13:16 +0100)
BugLink: https://bugs.launchpad.net/bugs/1853915
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/wireless/intel/iwlwifi/mvm/sta.c

index 0d36cc9edb32312b22d0fe91aab55c1b3dd4f6a2..fda0c8cb7d19c3145f1846d4fc77e78f9d56e69d 100644 (file)
@@ -3104,10 +3104,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);