UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: mvm: remove duplicate if in iwl_mvm_setup_connection_keep() 

We repeated the same if twice in a row.  Remove the second one and
move the code block into the previous one.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Luca Coelho 2018-02-27 16:37:56 +02:00
parent 2d8c261511
commit 11a0513cac
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
View File

@ -1503,6 +1503,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,
.conf.cipher = gtkdata.cipher, .conf.cipher = gtkdata.cipher,
.conf.keyidx = status->gtk.key_index, .conf.keyidx = status->gtk.key_index,
}; };
__be64 replay_ctr;
switch (gtkdata.cipher) { switch (gtkdata.cipher) {
case WLAN_CIPHER_SUITE_CCMP: case WLAN_CIPHER_SUITE_CCMP:
@ -1524,11 +1525,9 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,
if (IS_ERR(key)) if (IS_ERR(key))
return false; return false;
iwl_mvm_set_key_rx_seq(mvm, key, status); iwl_mvm_set_key_rx_seq(mvm, key, status);
}
if (status->num_of_gtk_rekeys) { replay_ctr = cpu_to_be64(le64_to_cpu(status->replay_ctr));
__be64 replay_ctr =
cpu_to_be64(le64_to_cpu(status->replay_ctr));
ieee80211_gtk_rekey_notify(vif, vif->bss_conf.bssid, ieee80211_gtk_rekey_notify(vif, vif->bss_conf.bssid,
(void *)&replay_ctr, GFP_KERNEL); (void *)&replay_ctr, GFP_KERNEL);
} }