All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maya Erez <merez@codeaurora.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Maya Erez <merez@codeaurora.org>,
	linux-wireless@vger.kernel.org, wil6210@qti.qualcomm.com
Subject: [PATCH 5/9] wil6210: allocate rx reorder buffer only if rx reorder is enabled
Date: Thu, 23 Aug 2018 14:47:09 +0300	[thread overview]
Message-ID: <1535024833-15178-6-git-send-email-merez@codeaurora.org> (raw)
In-Reply-To: <1535024833-15178-1-git-send-email-merez@codeaurora.org>

wil_addba_rx_request allocates the rx reorder buffer regardless
of use_rx_hw_reordering settings.
Fix this by checking wil->use_rx_hw_reordering before allocating
the reorder buffer.

Signed-off-by: Maya Erez <merez@codeaurora.org>
---
 drivers/net/wireless/ath/wil6210/rx_reorder.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/rx_reorder.c b/drivers/net/wireless/ath/wil6210/rx_reorder.c
index b608aa1..983bd00 100644
--- a/drivers/net/wireless/ath/wil6210/rx_reorder.c
+++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c
@@ -382,11 +382,13 @@ int wil_addba_rx_request(struct wil6210_priv *wil, u8 mid,
 	}
 
 	/* apply */
-	r = wil_tid_ampdu_rx_alloc(wil, agg_wsize, ssn);
-	spin_lock_bh(&sta->tid_rx_lock);
-	wil_tid_ampdu_rx_free(wil, sta->tid_rx[tid]);
-	sta->tid_rx[tid] = r;
-	spin_unlock_bh(&sta->tid_rx_lock);
+	if (!wil->use_rx_hw_reordering) {
+		r = wil_tid_ampdu_rx_alloc(wil, agg_wsize, ssn);
+		spin_lock_bh(&sta->tid_rx_lock);
+		wil_tid_ampdu_rx_free(wil, sta->tid_rx[tid]);
+		sta->tid_rx[tid] = r;
+		spin_unlock_bh(&sta->tid_rx_lock);
+	}
 
 out:
 	return rc;
-- 
1.9.1

  parent reply	other threads:[~2018-08-23 15:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-23 11:47 [PATCH 0/9] wil6210 patches Maya Erez
2018-08-23 11:47 ` [PATCH 1/9] wil6210: remove reset file from debugfs Maya Erez
2018-08-28 13:49   ` Kalle Valo
2018-08-23 11:47 ` [PATCH 2/9] wil6210: add support for channel 4 Maya Erez
2018-08-23 11:47 ` [PATCH 3/9] wil6210: drop Rx multicast packets that are looped-back to STA Maya Erez
2018-08-23 11:47 ` [PATCH 4/9] wil6210: set edma variables only for Talyn-MB devices Maya Erez
2018-08-23 11:47 ` Maya Erez [this message]
2018-08-23 11:47 ` [PATCH 6/9] wil6210: prevent usage of tx ring 0 for eDMA Maya Erez
2018-08-23 11:47 ` [PATCH 7/9] wil6210: fix RX buffers release and unmap Maya Erez
2018-08-23 11:47 ` [PATCH 8/9] wil6210: add FT roam support for AP and station Maya Erez
2018-08-23 11:47 ` [PATCH 9/9] wil6210: fix invalid memory access for rx_buff_mgmt debugfs Maya Erez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1535024833-15178-6-git-send-email-merez@codeaurora.org \
    --to=merez@codeaurora.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=wil6210@qti.qualcomm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.