evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath10k: wakeup device from wow suspend on GTK rekey failure"

Browse source
This commit is contained in:
Linux Build Service Account 2018-01-18 00:05:36 -08:00 • committed by Gerrit - the friendly Code Review server
commit 742c761dbe
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/ath/ath10k/wow.c
View file

@ -25,7 +25,9 @@
static const struct wiphy_wowlan_support ath10k_wowlan_support = { static const struct wiphy_wowlan_support ath10k_wowlan_support = {
.flags = WIPHY_WOWLAN_DISCONNECT | .flags = WIPHY_WOWLAN_DISCONNECT |
WIPHY_WOWLAN_MAGIC_PKT, WIPHY_WOWLAN_MAGIC_PKT |
WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
WIPHY_WOWLAN_GTK_REKEY_FAILURE,
.pattern_min_len = WOW_MIN_PATTERN_SIZE, .pattern_min_len = WOW_MIN_PATTERN_SIZE,
.pattern_max_len = WOW_MAX_PATTERN_SIZE, .pattern_max_len = WOW_MAX_PATTERN_SIZE,
.max_pkt_offset = WOW_MAX_PKT_OFFSET, .max_pkt_offset = WOW_MAX_PKT_OFFSET,
@ -109,6 +111,9 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,
if (wowlan->magic_pkt) if (wowlan->magic_pkt)
__set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &wow_mask); __set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &wow_mask);
if (wowlan->gtk_rekey_failure)
__set_bit(WOW_GTK_ERR_EVENT, &wow_mask);
break; break;
default: default:
break; break;
@ -331,7 +336,7 @@ void ath10k_wow_op_set_rekey_data(struct ieee80211_hw *hw,
memcpy(&arvif->gtk_rekey_data.kek, data->kek, NL80211_KEK_LEN); memcpy(&arvif->gtk_rekey_data.kek, data->kek, NL80211_KEK_LEN);
memcpy(&arvif->gtk_rekey_data.kck, data->kck, NL80211_KCK_LEN); memcpy(&arvif->gtk_rekey_data.kck, data->kck, NL80211_KCK_LEN);
arvif->gtk_rekey_data.replay_ctr = arvif->gtk_rekey_data.replay_ctr =
__cpu_to_le64(*(__le64 *)data->replay_ctr); cpu_to_le64(be64_to_cpup((__be64 *)data->replay_ctr));
arvif->gtk_rekey_data.valid = true; arvif->gtk_rekey_data.valid = true;
mutex_unlock(&ar->conf_mutex); mutex_unlock(&ar->conf_mutex);
} }