From: "Javier F. Arias" <jarias.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com
Subject: [PATCH 5/9] staging: rtl8723bs: Add necessary braces
Date: Tue, 12 Nov 2019 11:54:32 -0500 [thread overview]
Message-ID: <9653d1c5ea7ebd7b4137edea4f5eef74ea65703b.1573577309.git.jarias.linux@gmail.com> (raw)
In-Reply-To: <cover.1573577309.git.jarias.linux@gmail.com>
This patchset adds braces when they should be used on all arms of
the statement.
Issue found by Checkpatch.
Signed-off-by: Javier F. Arias <jarias.linux@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_xmit.c | 31 +++++++++++++++--------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index fdb585ff5925..42bd5d8362fa 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -370,8 +370,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
/* Other fragments are protected by previous fragment. */
/* So we only need to check the length of first fragment. */
if (pmlmeext->cur_wireless_mode < WIRELESS_11_24N || padapter->registrypriv.wifi_spec) {
- if (sz > padapter->registrypriv.rts_thresh)
+ if (sz > padapter->registrypriv.rts_thresh) {
pattrib->vcs_mode = RTS_CTS;
+ }
else {
if (pattrib->rtsen)
pattrib->vcs_mode = RTS_CTS;
@@ -679,8 +680,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_ap);
- } else
+ } else {
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_unknown);
+ }
pattrib->pktlen = pktfile.pkt_len;
@@ -724,8 +726,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
rtw_set_scan_deny(padapter, 3000);
/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
- if (pattrib->icmp_pkt == 1)
+ if (pattrib->icmp_pkt == 1) {
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1);
+ }
else if (pattrib->dhcp_pkt == 1) {
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_active);
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
@@ -926,8 +929,9 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
default:
break;
}
- } else
+ } else {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n"));
+ }
return _SUCCESS;
}
@@ -1204,8 +1208,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
ClearMFrag(mem_start);
break;
- } else
+ } else {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
+ }
addr = (SIZE_PTR)(pframe);
@@ -1446,8 +1451,9 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
case AUTO_VCS:
default:
perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len);
- if (!perp)
+ if (!perp) {
pxmitpriv->vcs = NONE_VCS;
+ }
else {
protection = (*(perp + 2)) & BIT(1);
if (protection) {
@@ -1455,8 +1461,9 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
pxmitpriv->vcs = RTS_CTS;
else
pxmitpriv->vcs = CTS_TO_SELF;
- } else
+ } else {
pxmitpriv->vcs = NONE_VCS;
+ }
}
break;
@@ -1509,8 +1516,9 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv,
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
}
- } else
+ } else {
DBG_871X("%s fail, no xmitbuf available !!!\n", __func__);
+ }
return pxmitbuf;
}
@@ -2177,11 +2185,12 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe)
, attrib->ether_type, attrib->dhcp_pkt?" DHCP":"");
allow = true;
}
- } else if (registry->hiq_filter == RTW_HIQ_FILTER_ALLOW_ALL)
+ } else if (registry->hiq_filter == RTW_HIQ_FILTER_ALLOW_ALL) {
allow = true;
- else if (registry->hiq_filter == RTW_HIQ_FILTER_DENY_ALL) {
- } else
+ } else if (registry->hiq_filter == RTW_HIQ_FILTER_DENY_ALL) {
+ } else {
rtw_warn_on(1);
+ }
return allow;
}
--
2.20.1
next prev parent reply other threads:[~2019-11-12 16:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 16:52 [PATCH 0/9] staging: rtl8723bs: cleanup patches Javier F. Arias
2019-11-12 16:53 ` [PATCH 1/9] staging: rtl8723bs: Remove multiple blank lines Javier F. Arias
2019-11-12 16:53 ` [PATCH 2/9] staging: rtl8723bs: Remove blank lines before a close brace Javier F. Arias
2019-11-12 16:53 ` [PATCH 3/9] staging: rtl8723bs: Remove blank lines after an open brace Javier F. Arias
2019-11-12 16:54 ` [PATCH 4/9] staging: rtl8723bs: Remove unnecessary braces Javier F. Arias
2019-11-12 16:54 ` Javier F. Arias [this message]
2019-11-12 23:04 ` [PATCH 5/9] staging: rtl8723bs: Add necessary braces Greg KH
2019-11-13 0:22 ` [Outreachy kernel] " Javier F. Arias
2019-11-12 16:54 ` [PATCH 6/9] staging: rtl8723bs: Fix unbalanced braces Javier F. Arias
2019-11-12 16:55 ` [PATCH 7/9] staging: rtl8723bs: Fix incorrect type in argument warnings Javier F. Arias
2019-11-12 17:11 ` Joe Perches
2019-11-12 23:00 ` [Outreachy kernel] " Javier F. Arias
2019-11-12 20:33 ` Greg KH
2019-11-13 1:12 ` [Outreachy kernel] " Javier F. Arias
2019-11-12 16:55 ` [PATCH 8/9] staging: rtl8723bs: Remove unnecessary conditional block Javier F. Arias
2019-11-12 16:56 ` [PATCH 9/9] staging: rtl8723bs: Rename variable Javier F. Arias
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=9653d1c5ea7ebd7b4137edea4f5eef74ea65703b.1573577309.git.jarias.linux@gmail.com \
--to=jarias.linux@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=outreachy-kernel@googlegroups.com \
/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).