diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-11-18 15:40:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-19 10:37:03 -0500 |
| commit | 3e9e40e74753346218e8285cf1ecff9ef3a624c6 (patch) | |
| tree | efc76c91903ebe831f20503ede23baebfc447222 /drivers/net | |
| parent | ab677ff4ad15bc26c359490ee201557f3a6d20df (diff) | |
| download | linux-3e9e40e74753346218e8285cf1ecff9ef3a624c6.tar.bz2 | |
virtio_net: Simplify call sites for virtio_net_hdr_{from, to}_skb().
No point storing the return value of virtio_net_hdr_to_skb() or
virtio_net_hdr_from_skb() to a variable when the value is used only
once as a boolean in an immediately following if statement.
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvtap.c | 5 | ||||
| -rw-r--r-- | drivers/net/tun.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 070e3290aa6e..5da9861ad79c 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -821,9 +821,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, if (iov_iter_count(iter) < vnet_hdr_len) return -EINVAL; - ret = virtio_net_hdr_from_skb(skb, &vnet_hdr, - macvtap_is_little_endian(q)); - if (ret) + if (virtio_net_hdr_from_skb(skb, &vnet_hdr, + macvtap_is_little_endian(q))) BUG(); if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) != diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 1588469844e7..3b8d8cc6d2ea 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1252,8 +1252,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, return -EFAULT; } - err = virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun)); - if (err) { + if (virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun))) { this_cpu_inc(tun->pcpu_stats->rx_frame_errors); kfree_skb(skb); return -EINVAL; @@ -1367,9 +1366,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, if (iov_iter_count(iter) < vnet_hdr_sz) return -EINVAL; - ret = virtio_net_hdr_from_skb(skb, &gso, - tun_is_little_endian(tun)); - if (ret) { + if (virtio_net_hdr_from_skb(skb, &gso, + tun_is_little_endian(tun))) { struct skb_shared_info *sinfo = skb_shinfo(skb); pr_err("unexpected GSO type: " "0x%x, gso_size %d, hdr_len %d\n", |