diff options
| author | Peng Li <lipeng321@huawei.com> | 2021-05-28 03:12:44 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-05-29 00:08:11 +0300 |
| commit | 168a196ffcff6aee6834cf73fc60d5cc387a0d85 (patch) | |
| tree | 3e5b21da80cb797dc6b3782e7589fd01f30a9467 /drivers/net/wan/hdlc_fr.c | |
| parent | 30e7720d379ad868ae7a510457ad8f2bf44ef056 (diff) | |
| download | linux-168a196ffcff6aee6834cf73fc60d5cc387a0d85.tar.xz | |
net: hdlc_fr: move out assignment in if condition
Should not use assignment in if condition.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wan/hdlc_fr.c')
| -rw-r--r-- | drivers/net/wan/hdlc_fr.c | 12 |
1 files 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) |