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>

1 files changed, 5 insertions, 1 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 862eaa744a54..b6d2b32933ba 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