Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e9e40e7 authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by David S. Miller
Browse files

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: default avatarJarno Rajahalme <jarno@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab677ff4

drivers/net/macvtap.c

+2 −3
Original line number Diff line number Diff line
@@ -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) !=

drivers/net/tun.c

+3 −5
Original line number Diff line number Diff line
@@ -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",