From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941011AbdDTEe7 (ORCPT ); Thu, 20 Apr 2017 00:34:59 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:44028 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940988AbdDTEe4 (ORCPT ); Thu, 20 Apr 2017 00:34:56 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1DE2260F92 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: Arnd Bergmann Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , "Michael S. Tsirkin" , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] brcmfmac: fix build without CONFIG_BRCMFMAC_PROTO_BCDC References: <20170419221133.2180685-1-arnd@arndb.de> Date: Thu, 20 Apr 2017 07:34:31 +0300 In-Reply-To: <20170419221133.2180685-1-arnd@arndb.de> (Arnd Bergmann's message of "Thu, 20 Apr 2017 00:10:24 +0200") Message-ID: <874lxj7l48.fsf@codeaurora.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Arnd Bergmann writes: > With CONFIG_BRCMFMAC_PROTO_BCDC unset, we cannot build the fwsignal.c file: > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c: In function 'brcmf_fws_notify_credit_map': > drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1590:31: error: implicit declaration of function 'drvr_to_fws'; did you mean 'dev_to_psd'? [-Werror=implicit-function-declaration] > struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr); > drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1590:31: error: initialization makes pointer from integer without a cast [-Werror=int-conversion] > drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1621:31: error: initialization makes pointer from integer without a cast [-Werror=int-conversion] > > However, as pointed out in the changeset description for the patch that caused > the problem, fwsignal.c is only required when CONFIG_BRCMFMAC_PROTO_BCDC is > enabled, so we can simply change the Makefile to build it conditionally. > > Fixes: acf8ac41dd73 ("brcmfmac: remove reference to fwsignal data from struct brcmf_pub") > Signed-off-by: Arnd Bergmann The fix is actually for wireless-drivers-next, acf8ac41dd73 is not in net-next yet. And I already applied an identical fix from Arend: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=26ecfe01790381c4caa65ec9cce484c623f092c4 -- Kalle Valo