summaryrefslogtreecommitdiff
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-08 16:41:28 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-08 16:41:28 -0400
commit30d237a6c2e9be1bb816fe8e787b88fd7aad833b (patch)
treecd13b626214c43071bdb223e45654b4f06e16271 /net/mac80211/sta_info.h
parent3430284feab3caacf94984400c6e84d0858de880 (diff)
parentb4201cc4fc6e1c57d6d306b1f787865043d60129 (diff)
downloadlinux-sh-30d237a6c2e9be1bb816fe8e787b88fd7aad833b.tar.gz
Merge tag 'mac80211-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== For the current RC series, we have the following fixes: * TDLS fixes from Arik and Ilan * rhashtable fixes from Ben and myself * documentation fixes from Luis * U-APSD fixes from Emmanuel * a TXQ fix from Felix * and a compiler warning suppression from Jeff ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r--net/mac80211/sta_info.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 053f5c4fa495..62193f4bc37b 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -377,7 +377,6 @@ DECLARE_EWMA(signal, 1024, 8)
* @uploaded: set to true when sta is uploaded to the driver
* @sta: station information we share with the driver
* @sta_state: duplicates information about station state (for debug)
- * @beacon_loss_count: number of times beacon loss has triggered
* @rcu_head: RCU head used for freeing this station struct
* @cur_max_bandwidth: maximum bandwidth to use for TX to the station,
* taken from HT/VHT capabilities or VHT operating mode notification