From: Kalle Valo <kvalo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Johannes Berg <johannes@sipsolutions.net>,
Wireless <linux-wireless@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Wen Gong <quic_wgong@quicinc.com>,
Ayala Beker <ayala.beker@intel.com>,
Luca Coelho <luciano.coelho@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the mac80211-next tree
Date: Tue, 21 Dec 2021 14:31:31 +0200 [thread overview]
Message-ID: <8735mmm95o.fsf@tynnyri.adurom.net> (raw)
In-Reply-To: <20211221115004.1cd6b262@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 21 Dec 2021 11:50:04 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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);
I would remove the commented out code '/* if
(ieee80211_is_probe_resp(mgmt->frame_control)) */', otherwise looks good
to me.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-12-21 12:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 0:50 linux-next: build failure after merge of the mac80211-next tree Stephen Rothwell
2021-12-21 11:02 ` Johannes Berg
2021-12-21 11:15 ` Stephen Rothwell
2021-12-21 11:17 ` Johannes Berg
2021-12-21 12:31 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-11 1:24 Stephen Rothwell
2020-04-28 2:29 Stephen Rothwell
2020-04-28 7:01 ` Johannes Berg
2020-04-28 7:25 ` Sergey Matyukevich
2020-04-28 7:24 ` Johannes Berg
2020-04-28 7:45 ` Sergey Matyukevich
2020-04-28 7:46 ` Johannes Berg
2020-04-28 8:10 ` Sergey Matyukevich
2017-12-12 1:58 Stephen Rothwell
2017-12-12 8:46 ` Johannes Berg
[not found] ` <1513068419.26976.86.camel-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
2017-12-12 8:59 ` Toke Høiland-Jørgensen
2017-12-12 11:45 ` Kalle Valo
2017-12-12 13:24 ` Toke Høiland-Jørgensen
2016-02-24 0:59 Stephen Rothwell
2016-02-24 8:12 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8735mmm95o.fsf@tynnyri.adurom.net \
--to=kvalo@kernel.org \
--cc=ayala.beker@intel.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
--cc=quic_wgong@quicinc.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).