mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-06 03:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

net: hdlc_fr: move out assignment in if condition

Browse Source 
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>
This commit is contained in:
Peng Li
2021-05-28 08:12:44 +08:00
committed by Jakub Kicinski
parent 30e7720d37
commit 168a196ffc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wan/hdlc_fr.c
View File

@@ -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)