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 net-next 05/10] net: wan: move out assignment in if condition
Date: Wed, 26 May 2021 19:44:50 +0800 [thread overview]
Message-ID: <1622029495-30357-6-git-send-email-huangguangbin2@huawei.com> (raw)
In-Reply-To: <1622029495-30357-1-git-send-email-huangguangbin2@huawei.com>
From: Peng Li <lipeng321@huawei.com>
Should not use assignment in if condition.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 512ef79459da..a39e5082c20f 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -937,7 +937,8 @@ static int fr_rx(struct sk_buff *skb)
pvc->state.becn ^= 1;
}
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ skb = skb_share_check(skb, GFP_ATOMIC);
+ if (!skb) {
frad->stats.rx_dropped++;
return NET_RX_DROP;
}
@@ -1064,7 +1065,8 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
struct net_device *dev;
int used;
- if ((pvc = add_pvc(frad, dlci)) == NULL) {
+ pvc = add_pvc(frad, dlci);
+ if (!pvc) {
netdev_warn(frad, "Memory squeeze on fr_add_pvc()\n");
return -ENOBUFS;
}
@@ -1121,10 +1123,12 @@ static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
struct pvc_device *pvc;
struct net_device *dev;
- if ((pvc = find_pvc(hdlc, dlci)) == NULL)
+ pvc = find_pvc(hdlc, dlci);
+ if (!pvc)
return -ENOENT;
- if ((dev = *get_dev_p(pvc, type)) == NULL)
+ dev = *get_dev_p(pvc, type);
+ if (!dev)
return -ENOENT;
if (dev->flags & IFF_UP)
--
2.8.1
next prev parent reply other threads:[~2021-05-26 11:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 11:44 [PATCH net-next 00/10] net: wan: clean up some code style issues Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 01/10] net: wan: remove redundant blank lines Guangbin Huang
2021-05-27 0:57 ` Jakub Kicinski
2021-05-27 2:22 ` lipeng (Y)
2021-05-26 11:44 ` [PATCH net-next 02/10] net: wan: add blank line after declarations Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 03/10] net: wan: fix an code style issue about "foo* bar" Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 04/10] net: wan: add some required spaces Guangbin Huang
2021-05-26 11:44 ` Guangbin Huang [this message]
2021-05-26 11:44 ` [PATCH net-next 06/10] net: wan: code indent use tabs where possible Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 07/10] net: wan: remove space after '!' Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 08/10] net: wan: add braces {} to all arms of the statement Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 09/10] net: wan: remove redundant braces {} Guangbin Huang
2021-05-26 11:44 ` [PATCH net-next 10/10] net: wan: remove unnecessary out of memory message Guangbin Huang
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=1622029495-30357-6-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
all inboxes | Powered by JetHome®