iwlwifi: mvm: change name of iwl_mvm_d3_update_gtk
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 1 Nov 2015 11:06:37 +0000 (13:06 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 26 Nov 2015 14:38:50 +0000 (16:38 +0200)
This function updates the pairwise keys as well.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/d3.c

index 29ae58ebf223fa82be3e072ea4ac000e62d54884..76c20025a13d49e43bd79f75ee017381dc2f49c9 100644 (file)
@@ -1406,7 +1406,7 @@ struct iwl_mvm_d3_gtk_iter_data {
        int num_keys;
 };
 
-static void iwl_mvm_d3_update_gtks(struct ieee80211_hw *hw,
+static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif,
                                   struct ieee80211_sta *sta,
                                   struct ieee80211_key_conf *key,
@@ -1494,7 +1494,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,
        /* find last GTK that we used initially, if any */
        gtkdata.find_phase = true;
        ieee80211_iter_keys(mvm->hw, vif,
-                           iwl_mvm_d3_update_gtks, &gtkdata);
+                           iwl_mvm_d3_update_keys, &gtkdata);
        /* not trying to keep connections with MFP/unhandled ciphers */
        if (gtkdata.unhandled_cipher)
                return false;
@@ -1509,7 +1509,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,
         */
        gtkdata.find_phase = false;
        ieee80211_iter_keys(mvm->hw, vif,
-                           iwl_mvm_d3_update_gtks, &gtkdata);
+                           iwl_mvm_d3_update_keys, &gtkdata);
 
        if (status->num_of_gtk_rekeys) {
                struct ieee80211_key_conf *key;