linux-kernel - Re: linux-next: build warning after merge of the mac80211-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <a058901aa4baf5fa858a83f35c59a9b874c2d964.camel@sipsolutions.net>
Date:   Tue, 13 Apr 2021 13:32:17 +0200
From:   Johannes Berg <johannes@...solutions.net>
To:     "Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Wireless <linux-wireless@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build warning after merge of the mac80211-next tree

On Tue, 2021-04-13 at 10:39 +0000, Grumbach, Emmanuel wrote:
> Hi,
> 
> > 
> > Hi all,
> > 
> > After merging the mac80211-next tree, today's linux-next build (htmldocs)
> > produced this warning:
> > 
> > include/net/cfg80211.h:6643: warning: expecting prototype for
> > wiphy_rfkill_set_hw_state(). Prototype was for
> > wiphy_rfkill_set_hw_state_reason() instead
> > include/net/cfg80211.h:6643: warning: expecting prototype for
> 
> Ouch
> 
> Johannes, this is the fix:
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index 3b296f2b7a2c..c6134220dd8f 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -6634,7 +6634,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev,
>   */
>  
> 
>  /**
> - * wiphy_rfkill_set_hw_state - notify cfg80211 about hw block state
> + * wiphy_rfkill_set_hw_state_reason - notify cfg80211 about hw block state
>   * @wiphy: the wiphy
>   * @blocked: block status
>   * @reason: one of reasons in &enum rfkill_hard_block_reasons
> 
> Do you want a patch or you amend the original commit?
> It is not in net-next yet.

Please send a separate fix anyway, I've pushed it out publicly after all
and try not to rebase unless absolutely necessary.

johannes