diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
| commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
| tree | bb887907e0448d4d903f853c33b3c55a863412e2 /net/mac80211/sta_info.h | |
| parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
| parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
| download | linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.gz linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.bz2 linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 42f68cb8957e..bcda2ac7d844 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -336,6 +336,7 @@ struct ieee80211_tx_latency_stat { * @known_smps_mode: the smps_mode the client thinks we are in. Relevant for * AP only. * @cipher_scheme: optional cipher scheme for this station + * @last_tdls_pkt_time: holds the time in jiffies of last TDLS pkt ACKed */ struct sta_info { /* General information, mostly static */ |