From: Yuval Mintz Date: Thu, 25 Jun 2015 12:19:29 +0000 (+0300) Subject: bnx2x: Fix linearization for encapsulated packets X-Git-Tag: v4.1.12-92~249^2^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ec6d28bdfbfeef326fe11d0e08f1d23f4cfc3baa;p=users%2Fjedix%2Flinux-maple.git bnx2x: Fix linearization for encapsulated packets Orabug: 22066196 Due to FW constraints, driver must make sure that transmitted SKBs will not be too fragmented, or in the case that they are - that each 'window' of fragments passed to the FW would contain at least an mss worth of data. For encapsultaed packets the calculation is wrong, since it ignores the inner headers in the calculation of the headers' length. This could lead to a FW assertion in case of a too-fragmented encapsulated packet. Signed-off-by: Yuval Mintz Signed-off-by: Ariel Elior Signed-off-by: David S. Miller (cherry picked from commit 592b9b8d687827086344705631494e5f232bee50) Signed-off-by: Dan Duval --- diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index d5d202b95c9da..4c1764443febc 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3421,8 +3421,13 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb, u32 wnd_sum = 0; /* Headers length */ - hlen = (int)(skb_transport_header(skb) - skb->data) + - tcp_hdrlen(skb); + if (xmit_type & XMIT_GSO_ENC) + hlen = (int)(skb_inner_transport_header(skb) - + skb->data) + + inner_tcp_hdrlen(skb); + else + hlen = (int)(skb_transport_header(skb) - + skb->data) + tcp_hdrlen(skb); /* Amount of data (w/o headers) on linear part of SKB*/ first_bd_sz = skb_headlen(skb) - hlen;