From: Johannes Berg Date: Thu, 4 May 2023 13:45:02 +0000 (+0300) Subject: wifi: mac80211: simplify chanctx allocation X-Git-Tag: v6.1.37~615 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aefa37aa32cb4af9d3d24c469bdbe2b9cc083f61;p=platform%2Fkernel%2Flinux-starfive.git wifi: mac80211: simplify chanctx allocation [ Upstream commit 860e1b43da94551cd1e73adc36b3c64cc3e5dc01 ] There's no need to call ieee80211_recalc_chanctx_min_def() since it cannot and won't call the driver anyway; just use _ieee80211_recalc_chanctx_min_def() instead. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230504134511.828474-3-gregory.greenman@intel.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index e72cf074..76c6dec 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -638,7 +638,7 @@ ieee80211_alloc_chanctx(struct ieee80211_local *local, ctx->conf.rx_chains_dynamic = 1; ctx->mode = mode; ctx->conf.radar_enabled = false; - ieee80211_recalc_chanctx_min_def(local, ctx); + _ieee80211_recalc_chanctx_min_def(local, ctx); return ctx; }