| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 |
- From 5242a5444e0b6464d7455beb55d936dd192b5e9d Mon Sep 17 00:00:00 2001
- From: Arend Van Spriel <[email protected]>
- Date: Mon, 22 Jan 2018 21:46:39 +0100
- Subject: [PATCH] brcmfmac: assure bcdc dcmd api does not return value > 0
- The protocol layer api defines callbacks for dongle commands.
- Although not really well documented these should only return an
- error code in case of an error, or 0 upon success. In the bcdc
- protocol it can return value above 0 and we carry a fix in the
- caller of the protocol layer api. This patch makes it adhere to
- the intent of the api as described above.
- Reviewed-by: Hante Meuleman <[email protected]>
- Reviewed-by: Pieter-Paul Giesberts <[email protected]>
- Reviewed-by: Franky Lin <[email protected]>
- Signed-off-by: Arend van Spriel <[email protected]>
- Signed-off-by: Kalle Valo <[email protected]>
- ---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 6 +++++-
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c | 8 +++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
- @@ -211,6 +211,8 @@ retry:
- memcpy(buf, info, len);
- }
-
- + ret = 0;
- +
- /* Check the ERROR flag */
- if (flags & BCDC_DCMD_ERROR)
- ret = le32_to_cpu(msg->status);
- @@ -225,7 +227,7 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_p
- {
- struct brcmf_bcdc *bcdc = (struct brcmf_bcdc *)drvr->proto->pd;
- struct brcmf_proto_bcdc_dcmd *msg = &bcdc->msg;
- - int ret = 0;
- + int ret;
- u32 flags, id;
-
- brcmf_dbg(BCDC, "Enter, cmd %d len %d\n", cmd, len);
- @@ -249,6 +251,8 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_p
- goto done;
- }
-
- + ret = 0;
- +
- /* Check the ERROR flag */
- if (flags & BCDC_DCMD_ERROR)
- ret = le32_to_cpu(msg->status);
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
- @@ -121,11 +121,9 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp,
- else
- err = brcmf_proto_query_dcmd(drvr, ifp->ifidx, cmd, data, len);
-
- - if (err >= 0)
- - return 0;
- -
- - brcmf_dbg(FIL, "Failed: %s (%d)\n",
- - brcmf_fil_get_errstr((u32)(-err)), err);
- + if (err)
- + brcmf_dbg(FIL, "Failed: %s (%d)\n",
- + brcmf_fil_get_errstr((u32)(-err)), err);
-
- return err;
- }
|
