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