From patchwork Sat Sep 24 20:44:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9349305 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DB09607F2 for ; Sat, 24 Sep 2016 20:45:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0D7529054 for ; Sat, 24 Sep 2016 20:45:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2BE429057; Sat, 24 Sep 2016 20:45:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5528929054 for ; Sat, 24 Sep 2016 20:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761226AbcIXUo4 (ORCPT ); Sat, 24 Sep 2016 16:44:56 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35426 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756783AbcIXUoj (ORCPT ); Sat, 24 Sep 2016 16:44:39 -0400 Received: by mail-lf0-f68.google.com with SMTP id s64so7453283lfs.2; Sat, 24 Sep 2016 13:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/wZAeowFknHcA5bOkp8rcfCKrTvYgLAxbBl+PiAfytc=; b=tjLtRMjbgr01p3QQqTFc9IzVxDbRfjzFJsvVDXvG3dPxUgNQA4LP+wskEcGOwt+G7U Mzu8ogernqllK7bz4hwDHgShOBMqILH3G1KMfLLCQSnoD+GI7r3+lrxo6APpCGM811/a hlVmOAbXGohyC5XHIXk7BsVpUZCCejILHSrJE7BvLFs6oGZJljVpLUGhO340T3yMMWjW kRV+8Sa3kArWuprjLbDuInPK4R2s7VEEm74oH+naxODuFGyzVj9oeLq4hky8NTaOxaM1 Y7rZCiKqVMBNQq1Ar6cI486nPpE9vZxyeWfQSJX+EiBOeXFt/sUXLSAZ8x5gIthKZOht ok4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/wZAeowFknHcA5bOkp8rcfCKrTvYgLAxbBl+PiAfytc=; b=loHb1op2zFTwH+pWpe2Qr+vhz/Ztdx6Jkvh0VXPkiL2UYIy4A6+t3ba7RYeR5k6jgA GrP5HX6EufMQve/nMA+3XKEbikyJ0m4AuT7T5M1zRW5wZmssO2xD2AaRhY2sEEhI8FvN NWxjzT2EJfLrS575tF32VwQWlReB68fbIYgPqK9Iw7TJSK9t74WURGHE/DbDQuS5ZWWt cncPLnnU0Pp4sI/mhn9kDV7lBlZ5jXMjS9E3A9v8VcrOztvV2B79fZLjEW/79YCv2Klz 71/HS4tL1jEf5/CnzrAypakhhA0aAWCZvbAAnIVBIh9SofdhvThkJjIIyoe/fpnrICUP pckA== X-Gm-Message-State: AE9vXwOqowKdlZIvUIuxKpVp66LP+IemZWGRAMqXRpAmMrXMty6QOuP/dubz1XH/LdyTEQ== X-Received: by 10.46.5.215 with SMTP id 206mr4997393ljf.65.1474749877423; Sat, 24 Sep 2016 13:44:37 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id o84sm2286839lfi.34.2016.09.24.13.44.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Sep 2016 13:44:36 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/2] brcmfmac: compile fws(ignal) code only with BCDC support enabled Date: Sat, 24 Sep 2016 22:44:19 +0200 Message-Id: <20160924204419.10213-2-zajec5@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160924204419.10213-1-zajec5@gmail.com> References: <20160924204419.10213-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki It's not needed by the other (msgbuf) protocol, so let's save some size and compile it conditionally. Signed-off-by: Rafał Miłecki --- .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 +- .../broadcom/brcm80211/brcmfmac/fwsignal.h | 59 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index 9e4b505..ad3b06e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -27,7 +27,6 @@ brcmfmac-objs += \ chip.o \ fwil.o \ fweh.o \ - fwsignal.o \ p2p.o \ proto.o \ common.o \ @@ -37,7 +36,8 @@ brcmfmac-objs += \ btcoex.o \ vendor.o brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \ - bcdc.o + bcdc.o \ + fwsignal.o brcmfmac-$(CONFIG_BRCMFMAC_PROTO_MSGBUF) += \ commonring.o \ flowring.o \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h index 8f7c1d7..ba0c1bc 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h @@ -18,6 +18,7 @@ #ifndef FWSIGNAL_H_ #define FWSIGNAL_H_ +#ifdef CONFIG_BRCMFMAC_PROTO_BCDC int brcmf_fws_init(struct brcmf_pub *drvr); void brcmf_fws_deinit(struct brcmf_pub *drvr); bool brcmf_fws_skbs_queueing(struct brcmf_fws_info *fws); @@ -31,5 +32,63 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp); void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb); void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked); void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb); +#else +static inline int brcmf_fws_init(struct brcmf_pub *drvr) +{ + return -ENOTSUPP; +} + +static inline void brcmf_fws_deinit(struct brcmf_pub *drvr) +{ +} + +static inline bool brcmf_fws_skbs_queueing(struct brcmf_fws_info *fws) +{ + return false; +} + +static inline bool brcmf_fws_fc_active(struct brcmf_fws_info *fws) +{ + return false; +} + +static inline void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, + struct sk_buff *skb) +{ +} + +static inline int brcmf_fws_process_skb(struct brcmf_if *ifp, + struct sk_buff *skb) +{ + return -ENOTSUPP; +} + +static inline void brcmf_fws_reset_interface(struct brcmf_if *ifp) +{ +} + +static inline void brcmf_fws_add_interface(struct brcmf_if *ifp) +{ +} + +static inline void brcmf_fws_del_interface(struct brcmf_if *ifp) +{ +} + +static inline void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, + struct sk_buff *skb) +{ +} + +static inline void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, + bool flow_blocked) +{ +} + +static inline void brcmf_fws_rxreorder(struct brcmf_if *ifp, + struct sk_buff *skb) +{ +} +#endif #endif /* FWSIGNAL_H_ */