From patchwork Tue Dec 21 00:50:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 527392 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 1B75DC433F5 for ; Tue, 21 Dec 2021 00:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233495AbhLUAuI (ORCPT ); Mon, 20 Dec 2021 19:50:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232190AbhLUAuI (ORCPT ); Mon, 20 Dec 2021 19:50:08 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5DE0C061574; Mon, 20 Dec 2021 16:50:07 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4JHyXr5XjJz4xd4; Tue, 21 Dec 2021 11:50:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1640047806; bh=o7imnqc01K6O2x4L1xT595ExkFUcfmNcjumSxNKsTNQ=; h=Date:From:To:Cc:Subject:From; b=ISTij4Lc6XsfULDHvU77JbihwPhaCBWf/CyiyjMFIQ7T6OMRIZ/NGMglgkZU+V1/b 5EaQ92pEpg7Fn971jCpxLXmPwPK/Merd3AOPE432TFPbLw0dpH9MflaaruznC6Mcl2 wUMHuEK3mNeJ2Kc9ujwUgpvqcpoHJMHi6iVCwFbJtIGlQNfXq24sCF6KwkgHFcqUCf WFK25P3FhXcSBR9WR7zw7ZFGrk8LsF97kS2ctBxA6fgF51prdi2+Q9/3j73onfkpru ULRTvM3eT2B1kQ00c/sFdIHzlzApUOXRoTgAARxDjm7DU5+5xteFMpJWsmgqztinN+ 2ScWP/X2DgY3Q== Date: Tue, 21 Dec 2021 11:50:04 +1100 From: Stephen Rothwell To: Johannes Berg , Wireless , David Miller , Networking Cc: Kalle Valo , Wen Gong , Ayala Beker , Luca Coelho , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the mac80211-next tree Message-ID: <20211221115004.1cd6b262@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi all, After merging the mac80211-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wireless/ath/ath10k/wmi.c: In function 'ath10k_wmi_event_mgmt_rx': drivers/net/wireless/ath/ath10k/wmi.c:2626:12: error: too few arguments to function 'cfg80211_get_ies_channel_number' 2626 | ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/net/mac80211.h:21, from drivers/net/wireless/ath/ath10k/htt.h:16, from drivers/net/wireless/ath/ath10k/core.h:18, from drivers/net/wireless/ath/ath10k/wmi.c:11: include/net/cfg80211.h:6421:5: note: declared here 6421 | int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 7f599aeccbd2 ("cfg80211: Use the HE operation IE to determine a 6GHz BSS channel") interacting with commit 3bf2537ec2e3 ("ath10k: drop beacon and probe response which leak from other channel") from the net-next tree. I have applied the following merge fix patch for today (which, on reflection, may not be correct, but builds). From: Stephen Rothwell Date: Tue, 21 Dec 2021 11:40:49 +1100 Subject: [PATCH] fixup for "cfg80211: Use the HE operation IE to determine a 6GHz BSS channel" Signed-off-by: Stephen Rothwell --- drivers/net/wireless/ath/ath10k/wmi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 4733fd7fb169..657bd6a32a36 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2613,6 +2613,7 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) if (ieee80211_is_beacon(hdr->frame_control) || ieee80211_is_probe_resp(hdr->frame_control)) { struct ieee80211_mgmt *mgmt = (void *)skb->data; + enum cfg80211_bss_frame_type ftype; u8 *ies; int ies_ch; @@ -2623,9 +2624,14 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) ies = mgmt->u.beacon.variable; + if (ieee80211_is_beacon(mgmt->frame_control)) + ftype = CFG80211_BSS_FTYPE_BEACON; + else /* if (ieee80211_is_probe_resp(mgmt->frame_control)) */ + ftype = CFG80211_BSS_FTYPE_PRESP; + ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable, skb_tail_pointer(skb) - ies, - sband->band); + sband->band, ftype); if (ies_ch > 0 && ies_ch != channel) { ath10k_dbg(ar, ATH10K_DBG_MGMT,