From: Guangbin Huang <huangguangbin2@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <xie.he.0141@gmail.com>,
<ms@dev.tdt.de>, <willemb@google.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<lipeng321@huawei.com>, <tanhuazhong@huawei.com>,
<huangguangbin2@huawei.com>
Subject: [PATCH V2 net-next 08/10] net: hdlc_fr: add braces {} to all arms of the statement
Date: Fri, 28 May 2021 08:12:47 +0800 [thread overview]
Message-ID: <1622160769-6678-9-git-send-email-huangguangbin2@huawei.com> (raw)
In-Reply-To: <1622160769-6678-1-git-send-email-huangguangbin2@huawei.com>
From: Peng Li <lipeng321@huawei.com>
Braces {} should be used on all arms of this statement.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 77b4f65..5c2a2ec 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -613,10 +613,10 @@ static void fr_timer(struct timer_list *t)
fr_set_link_state(reliable, dev);
}
- if (state(hdlc)->settings.dce)
+ if (state(hdlc)->settings.dce) {
state(hdlc)->timer.expires = jiffies +
state(hdlc)->settings.t392 * HZ;
- else {
+ } else {
if (state(hdlc)->n391cnt)
state(hdlc)->n391cnt--;
@@ -671,8 +671,9 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
return 1;
}
i = 7;
- } else
+ } else {
i = 6;
+ }
if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
LMI_ANSI_CISCO_REPTYPE)) {
@@ -1013,8 +1014,9 @@ static void fr_start(struct net_device *dev)
/* First poll after 1 s */
state(hdlc)->timer.expires = jiffies + HZ;
add_timer(&state(hdlc)->timer);
- } else
+ } else {
fr_set_link_state(1, dev);
+ }
}
static void fr_stop(struct net_device *dev)
--
2.8.1
next prev parent reply other threads:[~2021-05-28 0:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 02/10] net: hdlc_fr: add blank line after declarations Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 03/10] net: hdlc_fr: fix an code style issue about "foo* bar" Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 04/10] net: hdlc_fr: add some required spaces Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 05/10] net: hdlc_fr: move out assignment in if condition Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 06/10] net: hdlc_fr: code indent use tabs where possible Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 07/10] net: hdlc_fr: remove space after '!' Guangbin Huang
2021-05-28 0:12 ` Guangbin Huang [this message]
2021-05-28 0:12 ` [PATCH V2 net-next 09/10] net: hdlc_fr: remove redundant braces {} Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 10/10] net: hdlc_fr: remove unnecessary out of memory message Guangbin Huang
2021-05-28 21:20 ` [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues patchwork-bot+netdevbpf
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=1622160769-6678-9-git-send-email-huangguangbin2@huawei.com \
--to=huangguangbin2@huawei.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=ms@dev.tdt.de \
--cc=netdev@vger.kernel.org \
--cc=tanhuazhong@huawei.com \
--cc=willemb@google.com \
--cc=xie.he.0141@gmail.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).