2 files changed, 72 insertions, 93 deletions

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index abb32037c3f7..a47b41dd966f 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -285,10 +285,8 @@ struct ath10k_vif {
         u32 aid;
         u8 bssid[ETH_ALEN];
 
-        struct work_struct wep_key_work;
         struct ieee80211_key_conf *wep_keys[WMI_MAX_KEY_INDEX + 1];
-        u8 def_wep_key_idx;
-        u8 def_wep_key_newidx;
+        s8 def_wep_key_idx;
 
         u16 tx_seq_no;
 
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f9440deffa26..d3fe1a378e8b 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -37,7 +37,7 @@
 static int ath10k_send_key(struct ath10k_vif *arvif,
                            struct ieee80211_key_conf *key,
                            enum set_key_cmd cmd,
-                           const u8 *macaddr)
+                           const u8 *macaddr, bool def_idx)
 {
         struct ath10k *ar = arvif->ar;
         struct wmi_vdev_install_key_arg arg = {
@@ -72,6 +72,9 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
                  * Otherwise pairwise key must be set */
                 if (memcmp(macaddr, arvif->vif->addr, ETH_ALEN))
                         arg.key_flags = WMI_KEY_PAIRWISE;
+
+                if (def_idx)
+                        arg.key_flags |= WMI_KEY_TX_USAGE;
                 break;
         default:
                 ath10k_warn(ar, "cipher %d is not supported\n", key->cipher);
@@ -89,7 +92,7 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
 static int ath10k_install_key(struct ath10k_vif *arvif,
                               struct ieee80211_key_conf *key,
                               enum set_key_cmd cmd,
-                              const u8 *macaddr)
+                              const u8 *macaddr, bool def_idx)
 {
         struct ath10k *ar = arvif->ar;
         int ret;
@@ -98,7 +101,7 @@ static int ath10k_install_key(struct ath10k_vif *arvif,
 
         reinit_completion(&ar->install_key_done);
 
-        ret = ath10k_send_key(arvif, key, cmd, macaddr);
+        ret = ath10k_send_key(arvif, key, cmd, macaddr, def_idx);
         if (ret)
                 return ret;
 
@@ -116,6 +119,7 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif,
         struct ath10k_peer *peer;
         int ret;
         int i;
+        bool def_idx;
 
         lockdep_assert_held(&ar->conf_mutex);
 
@@ -129,9 +133,14 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif,
         for (i = 0; i < ARRAY_SIZE(arvif->wep_keys); i++) {
                 if (arvif->wep_keys[i] == NULL)
                         continue;
+                /* set TX_USAGE flag for default key id */
+                if (arvif->def_wep_key_idx == i)
+                        def_idx = true;
+                else
+                        def_idx = false;
 
                 ret = ath10k_install_key(arvif, arvif->wep_keys[i], SET_KEY,
-                                         addr);
+                                         addr, def_idx);
                 if (ret)
                         return ret;
 
@@ -165,8 +174,9 @@ static int ath10k_clear_peer_keys(struct ath10k_vif *arvif,
                 if (peer->keys[i] == NULL)
                         continue;
 
+                /* key flags are not required to delete the key */
                 ret = ath10k_install_key(arvif, peer->keys[i],
-                                         DISABLE_KEY, addr);
+                                         DISABLE_KEY, addr, false);
                 if (ret && first_errno == 0)
                         first_errno = ret;
 
@@ -240,8 +250,8 @@ static int ath10k_clear_vdev_key(struct ath10k_vif *arvif,
 
                 if (i == ARRAY_SIZE(peer->keys))
                         break;
-
-                ret = ath10k_install_key(arvif, key, DISABLE_KEY, addr);
+                /* key flags are not required to delete the key */
+                ret = ath10k_install_key(arvif, key, DISABLE_KEY, addr, false);
                 if (ret && first_errno == 0)
                         first_errno = ret;
 
@@ -1855,7 +1865,8 @@ static void ath10k_bss_disassoc(struct ieee80211_hw *hw,
                 ath10k_warn(ar, "faield to down vdev %i: %d\n",
                             arvif->vdev_id, ret);
 
-        arvif->def_wep_key_idx = 0;
+        arvif->def_wep_key_idx = -1;
+
         arvif->is_up = false;
 }
 
@@ -1914,11 +1925,14 @@ static int ath10k_station_assoc(struct ath10k *ar,
                         }
                 }
 
-                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",
-                                    arvif->vdev_id, ret);
-                        return ret;
+                /* Plumb cached keys only for static WEP */
+                if (arvif->def_wep_key_idx != -1) {
+                        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",
+                                            arvif->vdev_id, ret);
+                                return ret;
+                        }
                 }
         }
 
@@ -2190,69 +2204,6 @@ static void ath10k_tx_h_nwifi(struct ieee80211_hw *hw, struct sk_buff *skb)
         }
 }
 
-static void ath10k_tx_wep_key_work(struct work_struct *work)
-{
-        struct ath10k_vif *arvif = container_of(work, struct ath10k_vif,
-                                                wep_key_work);
-        struct ath10k *ar = arvif->ar;
-        int ret, keyidx = arvif->def_wep_key_newidx;
-
-        mutex_lock(&arvif->ar->conf_mutex);
-
-        if (arvif->ar->state != ATH10K_STATE_ON)
-                goto unlock;
-
-        if (arvif->def_wep_key_idx == keyidx)
-                goto unlock;
-
-        ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vdev %d set keyidx %d\n",
-                   arvif->vdev_id, keyidx);
-
-        ret = ath10k_wmi_vdev_set_param(arvif->ar,
-                                        arvif->vdev_id,
-                                        arvif->ar->wmi.vdev_param->def_keyid,
-                                        keyidx);
-        if (ret) {
-                ath10k_warn(ar, "failed to update wep key index for vdev %d: %d\n",
-                            arvif->vdev_id,
-                            ret);
-                goto unlock;
-        }
-
-        arvif->def_wep_key_idx = keyidx;
-
-unlock:
-        mutex_unlock(&arvif->ar->conf_mutex);
-}
-
-static void ath10k_tx_h_update_wep_key(struct ieee80211_vif *vif,
-                                       struct ieee80211_key_conf *key,
-                                       struct sk_buff *skb)
-{
-        struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
-        struct ath10k *ar = arvif->ar;
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-
-        if (!ieee80211_has_protected(hdr->frame_control))
-                return;
-
-        if (!key)
-                return;
-
-        if (key->cipher != WLAN_CIPHER_SUITE_WEP40 &&
-            key->cipher != WLAN_CIPHER_SUITE_WEP104)
-                return;
-
-        if (key->keyidx == arvif->def_wep_key_idx)
-                return;
-
-        /* FIXME: Most likely a few frames will be TXed with an old key. Simply
-         * queueing frames until key index is updated is not an option because
-         * sk_buff may need more processing to be done, e.g. offchannel */
-        arvif->def_wep_key_newidx = key->keyidx;
-        ieee80211_queue_work(ar->hw, &arvif->wep_key_work);
-}
-
 static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
                                        struct ieee80211_vif *vif,
                                        struct sk_buff *skb)
@@ -2613,7 +2564,6 @@ static void ath10k_tx(struct ieee80211_hw *hw,
         struct ath10k *ar = hw->priv;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ieee80211_vif *vif = info->control.vif;
-        struct ieee80211_key_conf *key = info->control.hw_key;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 
         /* We should disable CCK RATE due to P2P */
@@ -2627,7 +2577,6 @@ static void ath10k_tx(struct ieee80211_hw *hw,
         /* it makes no sense to process injected frames like that */
         if (vif && vif->type != NL80211_IFTYPE_MONITOR) {
                 ath10k_tx_h_nwifi(hw, skb);
-                ath10k_tx_h_update_wep_key(vif, key, skb);
                 ath10k_tx_h_add_p2p_noa_ie(ar, vif, skb);
                 ath10k_tx_h_seq_no(vif, skb);
         }
@@ -3132,7 +3081,6 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
         arvif->ar = ar;
         arvif->vif = vif;
 
-        INIT_WORK(&arvif->wep_key_work, ath10k_tx_wep_key_work);
         INIT_LIST_HEAD(&arvif->list);
 
         if (ar->free_vdev_map == 0) {
@@ -3231,14 +3179,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
                 goto err_vdev_delete;
         }
 
-        vdev_param = ar->wmi.vdev_param->def_keyid;
-        ret = ath10k_wmi_vdev_set_param(ar, 0, vdev_param,
-                                        arvif->def_wep_key_idx);
-        if (ret) {
-                ath10k_warn(ar, "failed to set vdev %i default key id: %d\n",
-                            arvif->vdev_id, ret);
-                goto err_vdev_delete;
-        }
+        arvif->def_wep_key_idx = -1;
 
         vdev_param = ar->wmi.vdev_param->tx_encap_type;
         ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
@@ -3358,8 +3299,6 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
         int ret;
 
-        cancel_work_sync(&arvif->wep_key_work);
-
         mutex_lock(&ar->conf_mutex);
 
         spin_lock_bh(&ar->data_lock);
@@ -3731,6 +3670,7 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         const u8 *peer_addr;
         bool is_wep = key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
                       key->cipher == WLAN_CIPHER_SUITE_WEP104;
+        bool def_idx = false;
         int ret = 0;
 
         if (key->keyidx > WMI_MAX_KEY_INDEX)
@@ -3776,7 +3716,14 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         ath10k_clear_vdev_key(arvif, key);
         }
 
-        ret = ath10k_install_key(arvif, key, cmd, peer_addr);
+        /* set TX_USAGE flag for all the keys incase of dot1x-WEP. For
+         * static WEP, do not set this flag for the keys whose key id
+         * is  greater than default key id.
+         */
+        if (arvif->def_wep_key_idx == -1)
+                def_idx = true;
+
+        ret = ath10k_install_key(arvif, key, cmd, peer_addr, def_idx);
         if (ret) {
                 ath10k_warn(ar, "failed to install key for vdev %i peer %pM: %d\n",
                             arvif->vdev_id, peer_addr, ret);
@@ -3801,6 +3748,39 @@ exit:
         return ret;
 }
 
+static void ath10k_set_default_unicast_key(struct ieee80211_hw *hw,
+                                           struct ieee80211_vif *vif,
+                                           int keyidx)
+{
+        struct ath10k *ar = hw->priv;
+        struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+        int ret;
+
+        mutex_lock(&arvif->ar->conf_mutex);
+
+        if (arvif->ar->state != ATH10K_STATE_ON)
+                goto unlock;
+
+        ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vdev %d set keyidx %d\n",
+                   arvif->vdev_id, keyidx);
+
+        ret = ath10k_wmi_vdev_set_param(arvif->ar,
+                                        arvif->vdev_id,
+                                        arvif->ar->wmi.vdev_param->def_keyid,
+                                        keyidx);
+
+        if (ret) {
+                ath10k_warn(ar, "failed to update wep key index for vdev %d: %d\n",
+                            arvif->vdev_id,
+                            ret);
+                goto unlock;
+        }
+
+        arvif->def_wep_key_idx = keyidx;
+unlock:
+        mutex_unlock(&arvif->ar->conf_mutex);
+}
+
 static void ath10k_sta_rc_update_wk(struct work_struct *wk)
 {
         struct ath10k *ar;
@@ -4966,6 +4946,7 @@ static const struct ieee80211_ops ath10k_ops = {
         .hw_scan                        = ath10k_hw_scan,
         .cancel_hw_scan                 = ath10k_cancel_hw_scan,
         .set_key                        = ath10k_set_key,
+        .set_default_unicast_key        = ath10k_set_default_unicast_key,
         .sta_state                      = ath10k_sta_state,
         .conf_tx                        = ath10k_conf_tx,
         .remain_on_channel              = ath10k_remain_on_channel,