From: Eric Dumazet <edumazet@google.com>
Date: Wed, 16 Jan 2013 05:14:21 +0000 (-0800)
Subject: net_sched: fix qdisc_pkt_len_init()
X-Git-Tag: v3.9-rc1~139^2~366
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=757b8b1d2bfa1210592bfd2984852b155eb58746;p=platform%2Fkernel%2Flinux-stable.git

net_sched: fix qdisc_pkt_len_init()

commit 1def9238d4aa2 (net_sched: more precise pkt_len computation)
does a wrong computation of mac + network headers length, as it includes
the padding before the frame.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 862eaa7..b6d2b32 100644
--- a/net/core/dev.c
+++ b/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