From 6e0498559e9bb9b61fd5eba968454cc98ca01b91 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 13 Oct 2011 11:38:17 +0000 Subject: [PATCH] --- yaml --- r: 266681 b: refs/heads/master c: 5e6c355c47e75314fd2282d087616069d4093ecf h: refs/heads/master i: 266679: 8128149b471df7d6ace8c2e28c3e014b93abcbee v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6febe8a54814..f0defcce79c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5935f81c595897d213afcf756e3e41af7c704f0e +refs/heads/master: 5e6c355c47e75314fd2282d087616069d4093ecf diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index 1694038192e0..902f284fd054 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -658,6 +658,7 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd, frag->page_offset = 0; frag->size = rcd->len; skb->data_len += frag->size; + skb->truesize += PAGE_SIZE; skb_shinfo(skb)->nr_frags++; } @@ -1277,7 +1278,6 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, skb = ctx->skb; if (rcd->eop) { skb->len += skb->data_len; - skb->truesize += skb->data_len; vmxnet3_rx_csum(adapter, skb, (union Vmxnet3_GenericDesc *)rcd);