wil6210: remove unused rx_reorder members

Remove unused members from struct wil_tid_ampdu_rx

Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index d3b1069ebf7a0a049afb942cff7764b7ae69cd89..524a7d6898335ee0f805af7eb7d20dc1151d8874 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1379,8 +1379,7 @@ static void wil_print_rxtid(struct seq_file *s, struct wil_tid_ampdu_rx *r)
        u16 index = ((r->head_seq_num - r->ssn) & 0xfff) % r->buf_size;
        unsigned long long drop_dup = r->drop_dup, drop_old = r->drop_old;
 
-       seq_printf(s, "([%2d] %3d TU) 0x%03x [", r->buf_size, r->timeout,
-                  r->head_seq_num);
+       seq_printf(s, "([%2d]) 0x%03x [", r->buf_size, r->head_seq_num);
        for (i = 0; i < r->buf_size; i++) {
                if (i == index)
                        seq_printf(s, "%c", r->reorder_buf[i] ? 'O' : '|');

diff --git a/drivers/net/wireless/ath/wil6210/rx_reorder.c b/drivers/net/wireless/ath/wil6210/rx_reorder.c
index 14dcb0698deee611f514ef008f76539be2a3de5a..76f8084c1fd81acdce116f6a88901c79976e6852 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/rx_reorder.c
+++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c
@@ -206,7 +206,6 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)
 
        /* put the frame in the reordering buffer */
        r->reorder_buf[index] = skb;
-       r->reorder_time[index] = jiffies;
        r->stored_mpdu_num++;
        wil_reorder_release(ndev, r);
 
@@ -252,11 +251,8 @@ struct wil_tid_ampdu_rx *wil_tid_ampdu_rx_alloc(struct wil6210_priv *wil,
 
        r->reorder_buf =
                kcalloc(size, sizeof(struct sk_buff *), GFP_KERNEL);
-       r->reorder_time =
-               kcalloc(size, sizeof(unsigned long), GFP_KERNEL);
-       if (!r->reorder_buf || !r->reorder_time) {
+       if (!r->reorder_buf) {
                kfree(r->reorder_buf);
-               kfree(r->reorder_time);
                kfree(r);
                return NULL;
        }
@@ -286,7 +282,6 @@ void wil_tid_ampdu_rx_free(struct wil6210_priv *wil,
                kfree_skb(r->reorder_buf[i]);
 
        kfree(r->reorder_buf);
-       kfree(r->reorder_time);
        kfree(r);
 }
 

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index c9120dc8a435eea398576fcc7f854e55d3636a23..b623510c6f6c02d71724ca82b591c0465be4d8f8 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -493,38 +493,28 @@ struct pci_dev;
  * struct tid_ampdu_rx - TID aggregation information (Rx).
  *
  * @reorder_buf: buffer to reorder incoming aggregated MPDUs
- * @reorder_time: jiffies when skb was added
- * @session_timer: check if peer keeps Tx-ing on the TID (by timeout value)
- * @reorder_timer: releases expired frames from the reorder buffer.
  * @last_rx: jiffies of last rx activity
  * @head_seq_num: head sequence number in reordering buffer.
  * @stored_mpdu_num: number of MPDUs in reordering buffer
  * @ssn: Starting Sequence Number expected to be aggregated.
  * @buf_size: buffer size for incoming A-MPDUs
- * @timeout: reset timer value (in TUs).
  * @ssn_last_drop: SSN of the last dropped frame
  * @total: total number of processed incoming frames
  * @drop_dup: duplicate frames dropped for this reorder buffer
  * @drop_old: old frames dropped for this reorder buffer
- * @dialog_token: dialog token for aggregation session
  * @first_time: true when this buffer used 1-st time
  */
 struct wil_tid_ampdu_rx {
        struct sk_buff **reorder_buf;
-       unsigned long *reorder_time;
-       struct timer_list session_timer;
-       struct timer_list reorder_timer;
        unsigned long last_rx;
        u16 head_seq_num;
        u16 stored_mpdu_num;
        u16 ssn;
        u16 buf_size;
-       u16 timeout;
        u16 ssn_last_drop;
        unsigned long long total; /* frames processed */
        unsigned long long drop_dup;
        unsigned long long drop_old;
-       u8 dialog_token;
        bool first_time; /* is it 1-st time this buffer used? */
 };