diff options
author | Dave Airlie <airlied@redhat.com> | 2016-04-22 00:32:51 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-04-22 00:32:51 +0200 |
commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /net/mac80211/sta_info.h | |
parent | Merge tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-in... (diff) | |
parent | Linux 4.6-rc3 (diff) | |
download | linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.xz linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r-- | net/mac80211/sta_info.h | 1 |
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 |