diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-17 04:17:37 +0200 |
| commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
| tree | 688dbc38a3e218f2493d311b1d70a67668837347 /drivers/vhost/net.c | |
| parent | netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-028940342a906db8da014a7603a0deddc2c323dd.tar.xz linux-028940342a906db8da014a7603a0deddc2c323dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 853db7a08a26..f82a7394756e 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -24,6 +24,7 @@ #include <linux/if_arp.h> #include <linux/if_tun.h> #include <linux/if_macvlan.h> +#include <linux/if_vlan.h> #include <net/sock.h> @@ -286,8 +287,12 @@ static int peek_head_len(struct sock *sk) spin_lock_irqsave(&sk->sk_receive_queue.lock, flags); head = skb_peek(&sk->sk_receive_queue); - if (likely(head)) + if (likely(head)) { len = head->len; + if (vlan_tx_tag_present(head)) + len += VLAN_HLEN; + } + spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags); return len; } |