diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-01-15 21:14:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-16 00:41:19 -0500 |
| commit | 757b8b1d2bfa1210592bfd2984852b155eb58746 (patch) | |
| tree | 39db2219a523ec8a99951b09eb7794e2e8c09317 /net/core | |
| parent | 247fa82be1301e4f89eaa5dc10be62a9cc84e8c5 (diff) | |
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 862eaa744a5..b6d2b32933b 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 |