From af8318a93b1b5c9a61b8a79a4379357c52a12cb8 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Thu, 16 Feb 2012 01:48:56 +0000
Subject: [PATCH] --- yaml --- r: 287949 b: refs/heads/master c:
 b203262de63c56393d09e254242b57c002d8619d h: refs/heads/master i:   287947:
 f1eecbf6ef812e302b8c84de8e643859d4da0460 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2f15c7a2fe47..b4bf9ab0b0e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11aad99af6ef629ff3b05d1c9f0936589b204316
+refs/heads/master: b203262de63c56393d09e254242b57c002d8619d
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index de7fc345148a..3dcd3857a36c 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -843,8 +843,8 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 				/* for simplicity, don't copy L4 headers */
 				ctx->l4_hdr_size = 0;
 			}
-			ctx->copy_size = ctx->eth_ip_hdr_size +
-					 ctx->l4_hdr_size;
+			ctx->copy_size = min(ctx->eth_ip_hdr_size +
+					 ctx->l4_hdr_size, skb->len);
 		} else {
 			ctx->eth_ip_hdr_size = 0;
 			ctx->l4_hdr_size = 0;