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 EC4701863 for ; Wed, 28 Dec 2022 15:23:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5267DC433F0; Wed, 28 Dec 2022 15:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672241039; bh=YG6lVsrVTqRNh+4M9kK0c7vwuigfw/2hwuvyqQ5C5Wo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rWX6xYpoTZFS3X4O1cEQ4n6Jrz5jRQhcxFSkLxG3i0VhW+MdxVeYHuP6SsmAX/gm/ gaWgIRDC2dY9gUn3PA9ArjbJKHYxuc3aiHOjq4Fvb0vFlViXoGKqds1CWZRnZj4t+Z QifBSMOy52oVPzynfsqW+cB7t6z5KtamfFe/W2M8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Berg , Sasha Levin Subject: [PATCH 6.1 0198/1146] wifi: mac80211: fix ifdef symbol name Date: Wed, 28 Dec 2022 15:28:57 +0100 Message-Id: <20221228144335.523267711@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221228144330.180012208@linuxfoundation.org> References: <20221228144330.180012208@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit 9d13aff91ecd3f077b432df35291c945bde585be ] This should of course be CONFIG_, not CPTCFG_, which is an artifact from working with backports. Fixes: 9dd1953846c7 ("wifi: nl80211/mac80211: clarify link ID in control port TX") Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 874f2a4d831d..cc10ee1ff8e9 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2973,7 +2973,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, if (pre_conf_link_id != link_id && link_id != IEEE80211_LINK_UNSPECIFIED) { -#ifdef CPTCFG_MAC80211_VERBOSE_DEBUG +#ifdef CONFIG_MAC80211_VERBOSE_DEBUG net_info_ratelimited("%s: dropped frame to %pM with bad link ID request (%d vs. %d)\n", sdata->name, hdr.addr1, pre_conf_link_id, link_id); -- 2.35.1