From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7A87C3DA7D for ; Wed, 28 Dec 2022 15:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233213AbiL1PSL (ORCPT ); Wed, 28 Dec 2022 10:18:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233207AbiL1PSK (ORCPT ); Wed, 28 Dec 2022 10:18:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A471513F35 for ; Wed, 28 Dec 2022 07:18:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4A23DB8170E for ; Wed, 28 Dec 2022 15:18:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC7A7C433D2; Wed, 28 Dec 2022 15:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672240687; bh=QHXZepQeQqbgC7owBkZgnQXTcfrrAMohQMNozT4c7es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B87Rf3F/rh+07SDuO4qfdBRmHU7+QEN9E/a7Z/Ha0QjYAIea1KJj3Hm5NBv6ybjyg ictQkeYHBnMl0UBP/NM8+o7HejeUgASGY+x7WODZpxFBJZD/UgCnL0zPfso3E55WLe KVbGrg+sOp3MMIJ0LzbR5fSW5YXRKV65JnTWDCZc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Berg , Sasha Levin Subject: [PATCH 6.0 0191/1073] wifi: mac80211: fix ifdef symbol name Date: Wed, 28 Dec 2022 15:29:39 +0100 Message-Id: <20221228144333.201826619@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221228144328.162723588@linuxfoundation.org> References: <20221228144328.162723588@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 d2c4f9226f94..dafd3a480f02 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2934,7 +2934,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