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

Commit 971841a7 authored by Maya Erez's avatar Maya Erez Committed by Lior David
Browse files

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.

Change-Id: Ide0d2ad0b3851789f653b7fa1c6c9a66c08cf270
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
[liord@codeaurora.org: SPDX license]
Signed-off-by: default avatarLior David <liord@codeaurora.org>
parent 7a27403d

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

+9 −18
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (c) 2014-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#include "wil6210.h"
@@ -382,11 +371,13 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
	}



	/* apply */

	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;