leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: hdlc_x25: 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
Peng Li 2021-06-04 15:32:09 +08:00 committed by David S. Miller
parent 579ebffe79
commit ec1f377412
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wan/hdlc_x25.c
View File

@ -137,13 +137,15 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
switch (skb->data[0]) { switch (skb->data[0]) {
case X25_IFACE_DATA: /* Data to be transmitted */ case X25_IFACE_DATA: /* Data to be transmitted */
skb_pull(skb, 1); skb_pull(skb, 1);
if ((result = lapb_data_request(dev, skb)) != LAPB_OK) result = lapb_data_request(dev, skb);
if (result != LAPB_OK)
dev_kfree_skb(skb); dev_kfree_skb(skb);
spin_unlock_bh(&x25st->up_lock); spin_unlock_bh(&x25st->up_lock);
return NETDEV_TX_OK; return NETDEV_TX_OK;
case X25_IFACE_CONNECT: case X25_IFACE_CONNECT:
if ((result = lapb_connect_request(dev))!= LAPB_OK) { result = lapb_connect_request(dev);
if (result != LAPB_OK) {
if (result == LAPB_CONNECTED) if (result == LAPB_CONNECTED)
/* Send connect confirm. msg to level 3 */ /* Send connect confirm. msg to level 3 */
x25_connected(dev, 0); x25_connected(dev, 0);
@ -154,7 +156,8 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
break; break;
case X25_IFACE_DISCONNECT: case X25_IFACE_DISCONNECT:
if ((result = lapb_disconnect_request(dev)) != LAPB_OK) { result = lapb_disconnect_request(dev);
if (result != LAPB_OK) {
if (result == LAPB_NOTCONNECTED) if (result == LAPB_NOTCONNECTED)
/* Send disconnect confirm. msg to level 3 */ /* Send disconnect confirm. msg to level 3 */
x25_disconnected(dev, 0); x25_disconnected(dev, 0);
@ -237,7 +240,8 @@ static int x25_rx(struct sk_buff *skb)
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
struct x25_state *x25st = state(hdlc); struct x25_state *x25st = state(hdlc);
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) { skb = skb_share_check(skb, GFP_ATOMIC);
if (!skb) {
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
return NET_RX_DROP; return NET_RX_DROP;
} }
@ -333,8 +337,9 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)
if (result) if (result)
return result; return result;
if ((result = attach_hdlc_protocol(dev, &proto, result = attach_hdlc_protocol(dev, &proto,
sizeof(struct x25_state)))) sizeof(struct x25_state));
if (result)
return result; return result;
memcpy(&state(hdlc)->settings, &new_settings, size); memcpy(&state(hdlc)->settings, &new_settings, size);