diff options
| author |   Maya Erez <merez@codeaurora.org> | 2018-08-23 14:47:09 +0300 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2018-08-28 16:48:36 +0300 |
| commit | 686ab4f5bd8d696bfeef55ef761c7f7a6ad1b3ec (patch) | |
| tree | ecbfea07811881cdcdcbf4b14beaa40b1b9b1f7f /drivers/net/wireless/ath/wil6210 | |
| parent | wil6210: set edma variables only for Talyn-MB devices (diff) | |
| download | linux-dev-686ab4f5bd8d696bfeef55ef761c7f7a6ad1b3ec.tar.xz linux-dev-686ab4f5bd8d696bfeef55ef761c7f7a6ad1b3ec.zip | |
wil6210: allocate rx reorder buffer only if rx reorder is enabled
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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/ath/wil6210')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/rx_reorder.c | 12 |
1 files 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 b608aa16b4f1..983bd001b53b 100644 --- a/drivers/net/wireless/ath/wil6210/rx_reorder.c +++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c @@ -382,11 +382,13 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) } /* 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; |