From b1219e758ccfd5b219bb514472d51b9e18ced46d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 16 Jan 2013 14:31:56 -0500
Subject: [PATCH] --- yaml --- r: 351415 b: refs/heads/master c:
 8c174e6f77b37fcbd84d7c3b6d65414fbb444219 h: refs/heads/master i:   351413:
 3563f64adbdf5492ddcf1df09b9c011047531d73   351411:
 94dc3630c4fd68957099b605121f4f075015a752   351407:
 8b6a0a9bb44a2dd418856485c1a6b77e75fb09f0 v: v3

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

diff --git a/[refs] b/[refs]
index 90b04885c8d9..660e67065952 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d60923c465809cec44fb08c53da6cf0c53040dc1
+refs/heads/master: 8c174e6f77b37fcbd84d7c3b6d65414fbb444219
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