projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
macvtap.c
diff --git
a/drivers/net/macvtap.c
b/drivers/net/macvtap.c
index a449439bd65366e5790037c21a4d3ce3f0e1ce97..59e9605de316809a702951a5c6de3dbee3a43a69 100644
(file)
--- a/
drivers/net/macvtap.c
+++ b/
drivers/net/macvtap.c
@@
-725,6
+725,8
@@
static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
goto err_kfree;
}
+ skb_probe_transport_header(skb, ETH_HLEN);
+
rcu_read_lock_bh();
vlan = rcu_dereference_bh(q->vlan);
/* copy skb_ubuf_info for callback when skb has no error */