diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-10-16 10:55:51 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-10-21 04:08:21 -0400 |
commit | 763aa27a292113b6fd9f6ad8bf633edc9b13c98b (patch) | |
tree | f9eb8efba96557c67e06f5e265d1354e3f5b78ec | |
parent | a515de660747eb01f3ef80e75bfc51ac63cfc546 (diff) |
mac80211: remove sta->last_ack_signal
This file only feeds a debugfs file that isn't very useful, so remove
it. If necessary, we can add other ways to get this information, for
example in the NL80211_CMD_PROBE_CLIENT response.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | net/mac80211/debugfs_sta.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 2 | ||||
-rw-r--r-- | net/mac80211/status.c | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 06d52935036d..1200b6a581d2 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c | |||
@@ -50,7 +50,6 @@ static const struct file_operations sta_ ##name## _ops = { \ | |||
50 | STA_OPS(name) | 50 | STA_OPS(name) |
51 | 51 | ||
52 | STA_FILE(aid, sta.aid, D); | 52 | STA_FILE(aid, sta.aid, D); |
53 | STA_FILE(last_ack_signal, last_ack_signal, D); | ||
54 | 53 | ||
55 | static ssize_t sta_flags_read(struct file *file, char __user *userbuf, | 54 | static ssize_t sta_flags_read(struct file *file, char __user *userbuf, |
56 | size_t count, loff_t *ppos) | 55 | size_t count, loff_t *ppos) |
@@ -366,7 +365,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) | |||
366 | DEBUGFS_ADD(agg_status); | 365 | DEBUGFS_ADD(agg_status); |
367 | DEBUGFS_ADD(ht_capa); | 366 | DEBUGFS_ADD(ht_capa); |
368 | DEBUGFS_ADD(vht_capa); | 367 | DEBUGFS_ADD(vht_capa); |
369 | DEBUGFS_ADD(last_ack_signal); | ||
370 | 368 | ||
371 | DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates); | 369 | DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates); |
372 | DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments); | 370 | DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments); |
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index ce4271406692..7bb5781b4ce2 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -373,7 +373,6 @@ DECLARE_EWMA(signal, 1024, 8) | |||
373 | * @rx_dropped: number of dropped MPDUs from this STA | 373 | * @rx_dropped: number of dropped MPDUs from this STA |
374 | * @last_signal: signal of last received frame from this STA | 374 | * @last_signal: signal of last received frame from this STA |
375 | * @avg_signal: moving average of signal of received frames from this STA | 375 | * @avg_signal: moving average of signal of received frames from this STA |
376 | * @last_ack_signal: signal of last received Ack frame from this STA | ||
377 | * @last_seq_ctrl: last received seq/frag number from this STA (per TID | 376 | * @last_seq_ctrl: last received seq/frag number from this STA (per TID |
378 | * plus one for non-QoS frames) | 377 | * plus one for non-QoS frames) |
379 | * @tx_filtered_count: number of frames the hardware filtered for this STA | 378 | * @tx_filtered_count: number of frames the hardware filtered for this STA |
@@ -467,7 +466,6 @@ struct sta_info { | |||
467 | unsigned long rx_dropped; | 466 | unsigned long rx_dropped; |
468 | int last_signal; | 467 | int last_signal; |
469 | struct ewma_signal avg_signal; | 468 | struct ewma_signal avg_signal; |
470 | int last_ack_signal; | ||
471 | 469 | ||
472 | u8 chains; | 470 | u8 chains; |
473 | s8 chain_signal_last[IEEE80211_MAX_CHAINS]; | 471 | s8 chain_signal_last[IEEE80211_MAX_CHAINS]; |
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 98fd04c4b2a0..da67b84905a8 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c | |||
@@ -863,9 +863,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
863 | ieee80211_lost_packet(sta, info); | 863 | ieee80211_lost_packet(sta, info); |
864 | } | 864 | } |
865 | } | 865 | } |
866 | |||
867 | if (acked) | ||
868 | sta->last_ack_signal = info->status.ack_signal; | ||
869 | } | 866 | } |
870 | 867 | ||
871 | rcu_read_unlock(); | 868 | rcu_read_unlock(); |