From: "Rafał Miłecki" <zajec5@gmail.com>
To: Arend van Spriel <arend.vanspriel@broadcom.com>,
Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Franky Lin <franky.lin@broadcom.com>
Subject: Re: [PATCH 1/5] brcmfmac: wrap brcmf_fws_init into bcdc layer
Date: Wed, 29 Mar 2017 13:18:33 +0200 [thread overview]
Message-ID: <a1ced78f-6769-be2d-f2a6-cb3ae4d8a0c2@gmail.com> (raw)
In-Reply-To: <1490697808-5538-2-git-send-email-arend.vanspriel@broadcom.com>
On 03/28/2017 12:43 PM, Arend van Spriel wrote:
> From: Franky Lin <franky.lin@broadcom.com>
>
> Create a new protocol layer interface brcmf_proto_init_cb for protocol
> layer to finish initialzation after core module components(fweh and
> etc.) are initialized.
>
> Signed-off-by: Franky Lin <franky.lin@broadcom.com>
> Change-Id: I560d2478a7c09766cf07b20d74b31dff5ca6ac7b
> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/8156
These 2 lines are rather useless.
> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
Please use full names only.
> Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +-
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> index 92eafcc..bc24b00 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> @@ -417,6 +417,12 @@ static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp,
> brcmf_fws_reset_interface(ifp);
> }
>
> +static int
> +brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr)
> +{
> + return brcmf_fws_init(drvr);
> +}
> +
> int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
> {
> struct brcmf_bcdc *bcdc;
> @@ -443,6 +449,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
> drvr->proto->add_if = brcmf_proto_bcdc_add_if;
> drvr->proto->del_if = brcmf_proto_bcdc_del_if;
> drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;
> + drvr->proto->init_done = brcmf_proto_bcdc_init_done;
> drvr->proto->pd = bcdc;
>
> drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> index 60c6c78..9886280 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> @@ -986,7 +986,7 @@ int brcmf_bus_started(struct device *dev)
> }
> brcmf_feat_attach(drvr);
>
> - ret = brcmf_fws_init(drvr);
> + ret = brcmf_proto_init_done(drvr);
> if (ret < 0)
> goto fail;
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
> index 3048ed5..600fd33 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
> @@ -47,6 +47,7 @@ struct brcmf_proto {
> void (*add_if)(struct brcmf_if *ifp);
> void (*del_if)(struct brcmf_if *ifp);
> void (*reset_if)(struct brcmf_if *ifp);
> + int (*init_done)(struct brcmf_pub *drvr);
> void *pd;
> };
>
> @@ -145,4 +146,12 @@ static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb)
> drvr->proto->reset_if(ifp);
> }
>
> +static inline int
> +brcmf_proto_init_done(struct brcmf_pub *drvr)
> +{
> + if (!drvr->proto->init_done)
> + return 0;
> + return drvr->proto->init_done(drvr);
> +}
> +
> #endif /* BRCMFMAC_PROTO_H */
So how is it any different from change in my:
[PATCH] brcmfmac: wrap brcmf_fws_(de)init into bcdc layer
? Is it only about replacing "init" with "init_done"?
I don't see why you couldn't rebase your changes on top of my patch.
next prev parent reply other threads:[~2017-03-29 11:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 10:43 [PATCH 0/5] brcmfmac: network namespace support Arend van Spriel
2017-03-28 10:43 ` [PATCH 1/5] brcmfmac: wrap brcmf_fws_init into bcdc layer Arend van Spriel
2017-03-29 11:18 ` Rafał Miłecki [this message]
2017-03-30 8:08 ` Arend Van Spriel
2017-04-03 11:52 ` Kalle Valo
2017-04-05 12:43 ` [1/5] " Kalle Valo
2017-03-28 10:43 ` [PATCH 2/5] brcmfmac: move brcmf_fws_deinit to " Arend van Spriel
2017-03-29 11:23 ` Rafał Miłecki
2017-03-30 8:52 ` Arend Van Spriel
2017-03-28 10:43 ` [PATCH 3/5] brcmfmac: add support to move wiphy instance into network namespace Arend van Spriel
2017-03-28 10:43 ` [PATCH 4/5] brcmfmac: restore bus state when enter_D3 fails Arend van Spriel
2017-03-28 10:43 ` [PATCH 5/5] brcmfmac: no need for d11inf instance in brcmf_pno_start_sched_scan() Arend van Spriel
2017-03-29 11:15 ` [PATCH 0/5] brcmfmac: network namespace support Rafał Miłecki
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=a1ced78f-6769-be2d-f2a6-cb3ae4d8a0c2@gmail.com \
--to=zajec5@gmail.com \
--cc=arend.vanspriel@broadcom.com \
--cc=franky.lin@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/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).