---

yaml --- r: 351399 b: refs/heads/master c: 757b8b1 h: refs/heads/master i: 351397: 5c92b3e 351395: 58aac2a 351391: cdc021a v: v3
git-mirror · Jan 16, 2013 · 481277b · 481277b
1 parent 15f01be
commit 481277b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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