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

[Johannes Berg]

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