Commit 6f2db658 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: agg-tx: add a few locking assertions 



This is all true today, but difficult to understand since
the callers are in other files etc. Add two new lockdep
assertions to make things easier to read.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.7f03dec6a90b.I762c11e95da005b80fa0184cb1173b99ec362acf@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 888a325f

net/mac80211/agg-tx.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2010, Intel Corporation

 * Copyright 2007-2010, Intel Corporation

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2022 Intel Corporation

 * Copyright (C) 2018 - 2023 Intel Corporation

 */

 */





#include <linux/ieee80211.h>

#include <linux/ieee80211.h>
@@ -457,6 +457,8 @@ static void ieee80211_send_addba_with_timeout(struct sta_info *sta, 
	u8 tid = tid_tx->tid;

	u8 tid = tid_tx->tid;

	u16 buf_size;

	u16 buf_size;





	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	/* activate the timer for the recipient's addBA response */

	/* activate the timer for the recipient's addBA response */

	mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);

	mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);

	ht_dbg(sdata, "activated addBA response timer on %pM tid %d\n",

	ht_dbg(sdata, "activated addBA response timer on %pM tid %d\n",
@@ -795,6 +797,8 @@ void ieee80211_start_tx_ba_cb(struct sta_info *sta, int tid, 
	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sdata->local;





	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state)))

	if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state)))

		return;

		return;