summaryrefslogtreecommitdiff
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-11 07:10:21 +0400
committerDavid S. Miller <davem@davemloft.net>2013-12-11 07:10:21 +0400
commitbbd37626e6be9500e74aa244a3be1a69b6645ea0 (patch)
treee1979b61467a70f0c58e47d3a3f14d99602db526 /drivers/net/tun.c
parent730054da3868c35809fd31a4018044ab10b0e215 (diff)
downloadlinux-bbd37626e6be9500e74aa244a3be1a69b6645ea0.tar.xz
net: Revert macvtap/tun truncation signalling changes.
Jason Wang and Michael S. Tsirkin are still discussing how to properly fix this. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index dd1bd7aedc3c..e26cbea1ce68 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1183,11 +1183,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
const struct iovec *iv, int len)
{
struct tun_pi pi = { 0, skb->protocol };
- struct {
- __be16 h_vlan_proto;
- __be16 h_vlan_TCI;
- } veth;
- ssize_t total = 0, off = 0;
+ ssize_t total = 0;
int vlan_offset = 0;
if (!(tun->flags & TUN_NO_PI)) {
@@ -1252,11 +1248,14 @@ static ssize_t tun_put_user(struct tun_struct *tun,
total += tun->vnet_hdr_sz;
}
- off = total;
if (!vlan_tx_tag_present(skb)) {
len = min_t(int, skb->len, len);
} else {
int copy, ret;
+ struct {
+ __be16 h_vlan_proto;
+ __be16 h_vlan_TCI;
+ } veth;
veth.h_vlan_proto = skb->vlan_proto;
veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
@@ -1265,22 +1264,22 @@ static ssize_t tun_put_user(struct tun_struct *tun,
len = min_t(int, skb->len + VLAN_HLEN, len);
copy = min_t(int, vlan_offset, len);
- ret = skb_copy_datagram_const_iovec(skb, 0, iv, off, copy);
+ ret = skb_copy_datagram_const_iovec(skb, 0, iv, total, copy);
len -= copy;
- off += copy;
+ total += copy;
if (ret || !len)
goto done;
copy = min_t(int, sizeof(veth), len);
- ret = memcpy_toiovecend(iv, (void *)&veth, off, copy);
+ ret = memcpy_toiovecend(iv, (void *)&veth, total, copy);
len -= copy;
- off += copy;
+ total += copy;
if (ret || !len)
goto done;
}
- skb_copy_datagram_const_iovec(skb, vlan_offset, iv, off, len);
- total += skb->len + (vlan_offset ? sizeof(veth) : 0);
+ skb_copy_datagram_const_iovec(skb, vlan_offset, iv, total, len);
+ total += len;
done:
tun->dev->stats.tx_packets++;