diff mbox series

[39/40] wifi: mac80211: set wiphy for virtual monitors

Message ID	20230828135928.e55a2df1ca8b.I54569d0e2936e44debeb0a79bf20c77a88d18a66@changeid
State	New
Headers	show Return-Path: <linux-wireless-owner@vger.kernel.org> From: Johannes Berg <johannes@sipsolutions.net> To: linux-wireless@vger.kernel.org Cc: Johannes Berg <johannes.berg@intel.com> Subject: [PATCH 39/40] wifi: mac80211: set wiphy for virtual monitors Date: Mon, 28 Aug 2023 14:00:07 +0200 Message-ID: <20230828135928.e55a2df1ca8b.I54569d0e2936e44debeb0a79bf20c77a88d18a66@changeid> In-Reply-To: <20230828115927.116700-41-johannes@sipsolutions.net> References: <20230828115927.116700-41-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	wifi: cfg80211/mac80211: locking cleanups \| expand [00/40] wifi: cfg80211/mac80211: locking cleanups [01/40] wifi: mac80211: debugfs: lock wiphy instead of RTNL [02/40] wifi: mac80211: hold wiphy lock in netdev/link debugfs [03/40] wifi: mac80211: lock wiphy for aggregation debugfs [04/40] wifi: cfg80211: check RTNL when iterating devices [05/40] wifi: cfg80211: add flush functions for wiphy work [06/40] wifi: mac80211: flush wiphy work where appropriate [07/40] wifi: mac80211: convert A-MPDU work to wiphy work [08/40] wifi: mac80211: add more ops assertions [09/40] wifi: mac80211: move DFS CAC work to wiphy work [10/40] wifi: mac80211: move radar detect work to wiphy work [11/40] wifi: mac80211: move scan work to wiphy work [12/40] wifi: mac80211: move monitor work to wiphy work [13/40] wifi: mac80211: lock wiphy in IP address notifier [14/40] wifi: mac80211: move offchannel works to wiphy work [15/40] wifi: mac80211: move link activation work to wiphy work [16/40] wifi: mac80211: move dynamic PS to wiphy work [17/40] wifi: mac80211: move sched-scan stop work to wiphy work [18/40] wifi: mac80211: move TDLS work to wiphy work [19/40] wifi: mac80211: move key tailroom work to wiphy work [20/40] wifi: mac80211: move tspec work to wiphy work [21/40] wifi: mac80211: move filter reconfig to wiphy work [22/40] wifi: mac80211: move CSA finalize to wiphy work [23/40] wifi: mac80211: move color change finalize to wiphy work [24/40] wifi: mac80211: check wiphy mutex in ops [25/40] wifi: cfg80211: reg: hold wiphy mutex for wdev iteration [26/40] wifi: cfg80211: sme: hold wiphy lock for wdev iteration [27/40] wifi: cfg80211: hold wiphy lock in cfg80211_any_wiphy_oper_chan() [28/40] wifi: cfg80211: check wiphy mutex is held for wdev mutex [29/40] wifi: mac80211: ethtool: hold wiphy mutex [30/40] wifi: mac80211: hold wiphy_lock around concurrency checks [31/40] wifi: mac80211: extend wiphy lock in interface removal [32/40] wifi: mac80211: take wiphy lock for MAC addr change [33/40] wifi: mac80211: remove sta_mtx [34/40] wifi: mac80211: remove key_mtx [35/40] wifi: mac80211: remove chanctx_mtx [36/40] wifi: mac80211: remove ampdu_mlme.mtx [37/40] wifi: mac80211: remove local->mtx [38/40] wifi: mac80211: reduce iflist_mtx [39/40] wifi: mac80211: set wiphy for virtual monitors [40/40] wifi: cfg80211: remove wdev mutex

Commit Message

Johannes Berg Aug. 28, 2023, noon UTC

From: Johannes Berg <johannes.berg@intel.com>

Drivers might plausibly want to have this, but also the
locking assertions will need it later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/iface.c | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f7f58c3e8349..fc407be04ce9 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1134,6 +1134,7 @@  int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
 		 wiphy_name(local->hw.wiphy));
 	sdata->wdev.iftype = NL80211_IFTYPE_MONITOR;
 	mutex_init(&sdata->wdev.mtx);
+	sdata->wdev.wiphy = local->hw.wiphy;
 
 	ieee80211_sdata_init(local, sdata);