brcmfmac: add missing curly braces in brcmf_fws_txstatus_suppressed()

The 0-day testing from Fenguang Wu issued the following warning:

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git master
head:   796f1d0d945fa2a131cc98d1adcb0b1e2f0d8335
commit: efee12ac0535a63a4e3c46b4611509043dab5344
    [33/59] brcmfmac: Update fwsignal to fix out of order tx.

>> drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c:1393:2-56:
    code aligned with following code on line 1394

vim +1393 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c

71309e44  1387 	}
71309e44  1388
71309e44  1389 	entry->generation = genbit;
71309e44  1390
4ef9caaa  1391 	ret = brcmf_proto_hdrpull(fws->drvr, false, &ifidx, skb);
4ef9caaa  1392 	if (ret == 0)
efee12ac @1393 		brcmf_skb_htod_tag_set_field(skb, GENERATION, ..
efee12ac @1394 		brcmf_skbcb(skb)->htod_seq = seq;
efee12ac  1395 		if (brcmf_skb_htod_seq_get_field(skb, FROMFW)) {
efee12ac  1396 			brcmf_skb_htod_seq_set_field(skb, ..
efee12ac  1397 			brcmf_skb_htod_seq_set_field(skb, ..

This warning is valid and the if statement needs curly braces here.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index e9bdfdb95d8f06915fc734dd27053a3e092c046e..a5937840f0a7cfca1a1ca92ddfe672c12f0bd037 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1393,7 +1393,7 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo,
        entry->generation = genbit;
 
        ret = brcmf_proto_hdrpull(fws->drvr, false, &ifidx, skb);
-       if (ret == 0)
+       if (ret == 0) {
                brcmf_skb_htod_tag_set_field(skb, GENERATION, genbit);
                brcmf_skbcb(skb)->htod_seq = seq;
                if (brcmf_skb_htod_seq_get_field(skb, FROMFW)) {
@@ -1404,6 +1404,8 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo,
                }
                ret = brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_SUPPRESSED, fifo,
                                    skb);
+       }
+
        if (ret != 0) {
                /* suppress q is full or hdrpull failed, drop this packet */
                brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,