Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c28c31 authored by Dedy Lansky's avatar Dedy Lansky Committed by Maya Erez
Browse files

wil6210: remove unused rx_reorder members 



Remove unused members from struct wil_tid_ampdu_rx

Change-Id: I193d6d610ce615bd114d5a8356fa8c182c747f8a
Signed-off-by: default avatarDedy Lansky <dlansky@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Git-commit: 37f8d26d8347f659e4677b4e438708ce492262bf
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
parent 11dd6e21

drivers/net/wireless/ath/wil6210/debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -1680,8 +1680,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' : '|');

drivers/net/wireless/ath/wil6210/rx_reorder.c

+1 −6
Original line number Diff line number Diff line
@@ -205,7 +205,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);
@@ -251,11 +250,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;

	}
@@ -285,7 +281,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);

}

drivers/net/wireless/ath/wil6210/wil6210.h

+0 −10
Original line number Diff line number Diff line
@@ -620,38 +620,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? */

};