From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A6DD1F755B; Mon, 4 Nov 2024 10:55:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730717744; cv=none; b=TKTqijK4D3WZY4ajedbmPjkbkgO20XQRtlymMcmkONtbDjvfeovQrfOoMRsVDlqoHXT4e/TYPY+towYZPDZS++oKxkwioyFYHz7YraPiXB5MuKnVp18Kj0eMnoGUcEvrbPfttN6JDA669AvjG9c8ATBHCpD+2j4ZW4fcvNLIH0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730717744; c=relaxed/simple; bh=+OLKUtZuVadq41JrBY27nCN6auZO8OYRPVSmExa2HmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+6G4qRjel1M6zPFjLku6lKvrBgGZ1xaTar94ll4DxTgAolGFyfaCnlFjLiQsBOrdnkpCSis8Z6JvpmCdVXEXYemeYc8NgoPHOsmtzbUiEXA9f2rQcwklolZGJGARqClJL5a2mY29Ijv2JXQUUsSpkn4uX6oucwskMpb6b0zzjM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H8xHn0Rt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H8xHn0Rt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7921C4CECE; Mon, 4 Nov 2024 10:55:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730717743; bh=+OLKUtZuVadq41JrBY27nCN6auZO8OYRPVSmExa2HmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H8xHn0RtCcssJw0lYJlIv2xDTJJvDw1NYE0Sq6/KhofiKc4FURav4Bs9TqDcc6My4 blEa+qjuLVD/pKkDhlgnf22xANzw83vJequr1CgQ0R5+16G4BA8tO8NQoTwBcH0pAI VhqaS0ODsrCN5lCAp/URqL1A+DvZI+BNb7cCt4VnIrJ5h+w4OJ3APqldZdBrHugFgI +nETqJiGW07gm3AptBr7q+Mj2Fu9VeZKn2KCbJU7pr1JBX0CZlJhwAQaik2RYL5A6R O8KvqlkruNT4YxmViK8V+WA5SUMIU5jXO1MwpX77FQ4FzDIuseOvQLCDZ9ilEAHagZ 8bVdx3NUwFdPg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Greear , Johannes Berg , Sasha Levin , johannes@sipsolutions.net, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 2/5] mac80211: fix user-power when emulating chanctx Date: Mon, 4 Nov 2024 05:55:31 -0500 Message-ID: <20241104105539.98219-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241104105539.98219-1-sashal@kernel.org> References: <20241104105539.98219-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.322 Content-Transfer-Encoding: 8bit From: Ben Greear [ Upstream commit 9b15c6cf8d2e82c8427cd06f535d8de93b5b995c ] ieee80211_calc_hw_conf_chan was ignoring the configured user_txpower. If it is set, use it to potentially decrease txpower as requested. Signed-off-by: Ben Greear Link: https://patch.msgid.link/20241010203954.1219686-1-greearb@candelatech.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index e8c4e9c0c5a09..71d10bdee4309 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -140,6 +140,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) } power = ieee80211_chandef_max_power(&chandef); + if (local->user_power_level != IEEE80211_UNSET_POWER_LEVEL) + power = min(local->user_power_level, power); rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { -- 2.43.0