Commit c53cff5e authored by Basil Gor's avatar Basil Gor Committed by David S. Miller

vhost-net: fix handle_rx buffer size

Take vlan header length into account, when vlan id is stored as
vlan_tci. Otherwise tagged packets coming from macvtap will be
truncated.
Signed-off-by: default avatarBasil Gor <basil.gor@gmail.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13a8e0c8
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
#include <linux/if_macvlan.h> #include <linux/if_macvlan.h>
#include <linux/if_vlan.h>
#include <net/sock.h> #include <net/sock.h>
...@@ -283,8 +284,12 @@ static int peek_head_len(struct sock *sk) ...@@ -283,8 +284,12 @@ static int peek_head_len(struct sock *sk)
spin_lock_irqsave(&sk->sk_receive_queue.lock, flags); spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
head = skb_peek(&sk->sk_receive_queue); head = skb_peek(&sk->sk_receive_queue);
if (likely(head)) if (likely(head)) {
len = head->len; len = head->len;
if (vlan_tx_tag_present(head))
len += VLAN_HLEN;
}
spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags); spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
return len; return len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment