From 481277bcaca5a99fa2d365ed553a28e46b83de3b Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 15 Jan 2013 21:14:21 -0800
Subject: [PATCH] --- yaml --- r: 351399 b: refs/heads/master c:
 757b8b1d2bfa1210592bfd2984852b155eb58746 h: refs/heads/master i:   351397:
 5c92b3e126ac210984b75056f7f790299dc45a35   351395:
 58aac2ae76fbf9af8a945425ac8555917bb6109f   351391:
 cdc021acde2da2649360fceb6459bcb03df7c9ec v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 427ca7b9f4ec..eb3816219547 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 247fa82be1301e4f89eaa5dc10be62a9cc84e8c5
+refs/heads/master: 757b8b1d2bfa1210592bfd2984852b155eb58746
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 862eaa744a54..b6d2b32933ba 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2776,8 +2776,12 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
 	 * we add to pkt_len the headers size of all segments
 	 */
 	if (shinfo->gso_size)  {
-		unsigned int hdr_len = skb_transport_offset(skb);
+		unsigned int hdr_len;
 
+		/* mac layer + network layer */
+		hdr_len = skb_transport_header(skb) - skb_mac_header(skb);
+
+		/* + transport layer */
 		if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))
 			hdr_len += tcp_hdrlen(skb);
 		else