mac80211: remove STA infos last_ack stuff

These things aren't used and the only possible use is within
rate control algorithms, however those can, if they need it,
keep track of it in their private data. last_ack_ms isn't
even updated so completely useless.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 1a4d2c3775afcb76f453cc268e371dfb895b1737..ed7c9f3b4602eca8227381180cb2624a49f457a1 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -98,31 +98,6 @@ static ssize_t sta_num_ps_buf_frames_read(struct file *file,
 }
 STA_OPS(num_ps_buf_frames);
 
-static ssize_t sta_last_ack_rssi_read(struct file *file, char __user *userbuf,
-                                     size_t count, loff_t *ppos)
-{
-       char buf[100];
-       struct sta_info *sta = file->private_data;
-       int res = scnprintf(buf, sizeof(buf), "%d %d %d\n",
-                           sta->last_ack_rssi[0],
-                           sta->last_ack_rssi[1],
-                           sta->last_ack_rssi[2]);
-       return simple_read_from_buffer(userbuf, count, ppos, buf, res);
-}
-STA_OPS(last_ack_rssi);
-
-static ssize_t sta_last_ack_ms_read(struct file *file, char __user *userbuf,
-                                   size_t count, loff_t *ppos)
-{
-       char buf[20];
-       struct sta_info *sta = file->private_data;
-       int res = scnprintf(buf, sizeof(buf), "%d\n",
-                           sta->last_ack ?
-                           jiffies_to_msecs(jiffies - sta->last_ack) : -1);
-       return simple_read_from_buffer(userbuf, count, ppos, buf, res);
-}
-STA_OPS(last_ack_ms);
-
 static ssize_t sta_inactive_ms_read(struct file *file, char __user *userbuf,
                                    size_t count, loff_t *ppos)
 {
@@ -311,8 +286,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
 
        DEBUGFS_ADD(flags);
        DEBUGFS_ADD(num_ps_buf_frames);
-       DEBUGFS_ADD(last_ack_rssi);
-       DEBUGFS_ADD(last_ack_ms);
        DEBUGFS_ADD(inactive_ms);
        DEBUGFS_ADD(last_seq_ctrl);
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
@@ -326,8 +299,6 @@ void ieee80211_sta_debugfs_remove(struct sta_info *sta)
 {
        DEBUGFS_DEL(flags);
        DEBUGFS_DEL(num_ps_buf_frames);
-       DEBUGFS_DEL(last_ack_rssi);
-       DEBUGFS_DEL(last_ack_ms);
        DEBUGFS_DEL(inactive_ms);
        DEBUGFS_DEL(last_seq_ctrl);
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS

diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index da8462bbd5f4f54610e68424e5fac16faf51b2b0..9762803e48762ba6dcc5785d0a80b0dc937d8a64 100644 (file)
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -280,9 +280,6 @@ static void rate_control_pid_tx_status(void *priv, struct net_device *dev,
                sta->tx_num_consecutive_failures++;
                sta->tx_num_mpdu_fail++;
        } else {
-               sta->last_ack_rssi[0] = sta->last_ack_rssi[1];
-               sta->last_ack_rssi[1] = sta->last_ack_rssi[2];
-               sta->last_ack_rssi[2] = status->ack_signal;
                sta->tx_num_consecutive_failures = 0;
                sta->tx_num_mpdu_ok++;
        }

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index a669bcb8739f2cc29ba484f88b3ac0f2eb048a8a..bcc541d4b95c7f90c0d49fc5f99f92da28506b4b 100644 (file)
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -131,9 +131,6 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
                sta->tx_num_consecutive_failures++;
                sta->tx_num_mpdu_fail++;
        } else {
-               sta->last_ack_rssi[0] = sta->last_ack_rssi[1];
-               sta->last_ack_rssi[1] = sta->last_ack_rssi[2];
-               sta->last_ack_rssi[2] = status->ack_signal;
                sta->tx_num_consecutive_failures = 0;
                sta->tx_num_mpdu_ok++;
        }

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 7b5be309fe0ad13035d2e3dbf2351a1f98e469d4..86eed40ada7820381175a154b05b09f21bf8b558 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -177,8 +177,6 @@ struct sta_info {
        int last_rssi; /* RSSI of last received frame from this STA */
        int last_signal; /* signal of last received frame from this STA */
        int last_noise; /* noise of last received frame from this STA */
-       int last_ack_rssi[3]; /* RSSI of last received ACKs from this STA */
-       unsigned long last_ack;
        int channel_use;
        int channel_use_raw;
 
@@ -200,8 +198,6 @@ struct sta_info {
                struct dentry *dir;
                struct dentry *flags;
                struct dentry *num_ps_buf_frames;
-               struct dentry *last_ack_rssi;
-               struct dentry *last_ack_ms;
                struct dentry *inactive_ms;
                struct dentry *last_seq_ctrl;
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS