iwlwifi: mvm: set wep key for all stations in soft ap mode

When operating as a soft ap with wep security, the key was not
configured to the fw for the stations, based on the fact that the
key will be specified in the tx command.

However, in the new tx api the tx command does not include the key,
which resulted in all data frames going out un-encrypted.

Fix it by configuring the key for all the stations as they are added.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index b55a2e4a002452f95a271bbe6c6033ca50d7a310..c445e93951bf0f8542fe66e01d061d3c59f12b8f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -2476,6 +2476,9 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,
 
        iwl_mvm_mac_ctxt_remove(mvm, vif);
 
+       kfree(mvmvif->ap_wep_key);
+       mvmvif->ap_wep_key = NULL;
+
        mutex_unlock(&mvm->mutex);
 }
 
@@ -2968,7 +2971,13 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
                iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
                                     true);
 
-               ret = 0;
+               /* if wep is used, need to set the key for the station now */
+               if (vif->type == NL80211_IFTYPE_AP && mvmvif->ap_wep_key)
+                       ret = iwl_mvm_set_sta_key(mvm, vif, sta,
+                                                 mvmvif->ap_wep_key,
+                                                 STA_KEY_IDX_INVALID);
+               else
+                       ret = 0;
        } else if (old_state == IEEE80211_STA_AUTHORIZED &&
                   new_state == IEEE80211_STA_ASSOC) {
                /* disable beacon filtering */
@@ -3174,13 +3183,17 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw,
                break;
        case WLAN_CIPHER_SUITE_WEP40:
        case WLAN_CIPHER_SUITE_WEP104:
-               /* For non-client mode, only use WEP keys for TX as we probably
-                * don't have a station yet anyway and would then have to keep
-                * track of the keys, linking them to each of the clients/peers
-                * as they appear. For now, don't do that, for performance WEP
-                * offload doesn't really matter much, but we need it for some
-                * other offload features in client mode.
-                */
+               if (vif->type == NL80211_IFTYPE_AP) {
+                       struct iwl_mvm_vif *mvmvif =
+                               iwl_mvm_vif_from_mac80211(vif);
+
+                       mvmvif->ap_wep_key = kmemdup(key,
+                                                    sizeof(*key) + key->keylen,
+                                                    GFP_KERNEL);
+                       if (!mvmvif->ap_wep_key)
+                               return -ENOMEM;
+               }
+
                if (vif->type != NL80211_IFTYPE_STATION)
                        return 0;
                break;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 087e8a454ac20debbbb517a8e0ae03c6d8708c4a..33f8697740a587e3c62794f0798b5551e773e142 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -471,6 +471,7 @@ struct iwl_mvm_vif {
        netdev_features_t features;
 
        struct iwl_probe_resp_data __rcu *probe_resp_data;
+       struct ieee80211_key_conf *ap_wep_key;
 };
 
 static inline struct iwl_mvm_vif *

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 6ebc715d90df60634751544351ac4d8624229407..550e24da0f5bc9df560a22647e2872d9c0c476ce 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -67,6 +67,14 @@
 #include "sta.h"
 #include "rs.h"
 
+static int iwl_mvm_set_fw_key_idx(struct iwl_mvm *mvm);
+
+static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
+                               u32 sta_id,
+                               struct ieee80211_key_conf *key, bool mcast,
+                               u32 tkip_iv32, u16 *tkip_p1k, u32 cmd_flags,
+                               u8 key_offset, bool mfp);
+
 /*
  * New version of ADD_STA_sta command added new fields at the end of the
  * structure, so sending the size of the relevant API's structure is enough to
@@ -2096,6 +2104,19 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                iwl_mvm_enable_txq(mvm, vif->cab_queue, vif->cab_queue, 0,
                                   &cfg, timeout);
 
+       if (mvmvif->ap_wep_key) {
+               u8 key_offset = iwl_mvm_set_fw_key_idx(mvm);
+
+               if (key_offset == STA_KEY_IDX_INVALID)
+                       return -ENOSPC;
+
+               ret = iwl_mvm_send_sta_key(mvm, mvmvif->mcast_sta.sta_id,
+                                          mvmvif->ap_wep_key, 1, 0, NULL, 0,
+                                          key_offset, 0);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }