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

Commit 359d44d7 authored by Zhi Yong Wu's avatar Zhi Yong Wu Committed by David S. Miller
Browse files

macvtap: remove the dead branch 



Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59566b6e

drivers/net/macvtap.c

+2 −6
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb, 
	return 0;

}



static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,

static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,

				   struct virtio_net_hdr *vnet_hdr)

{

	memset(vnet_hdr, 0, sizeof(*vnet_hdr));
@@ -619,8 +619,6 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb, 
	} else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {

		vnet_hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;

	} /* else everything is zero */



	return 0;

}



/* Get packet from user space buffer */
@@ -778,9 +776,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, 
		if ((len -= vnet_hdr_len) < 0)

			return -EINVAL;



		ret = macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);

		if (ret)

			return ret;

		macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);



		if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))

			return -EFAULT;