From: Eric Dumazet Date: Fri, 24 Aug 2012 14:56:22 +0000 (+0530) Subject: be2net: dont pull too much data in skb linear part X-Git-Tag: v2.6.39-400.9.0~361 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=981ecdd7c220a6d50f86f6c01101fb11ca2944c2;p=users%2Fjedix%2Flinux-maple.git be2net: dont pull too much data in skb linear part skb_fill_rx_data() pulls 64 byte of data in skb->data Its too much for TCP (with no options) on IPv4, as total size of headers is 14 + 40 = 54 This means tcp stack and splice() are suboptimal, since tcp payload is in part in tcp->data, and in part in skb frag. Signed-off-by: Eric Dumazet Acked-by: Padmanabh Ratnakar Signed-off-by: David S. Miller --- diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 718fee0eb79b..43bc13eba45b 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -1202,16 +1202,16 @@ static void skb_fill_rx_data(struct be_rx_obj *rxo, struct sk_buff *skb, /* Copy data in the first descriptor of this completion */ curr_frag_len = min(rxcp->pkt_size, rx_frag_size); - /* Copy the header portion into skb_data */ - hdr_len = min(BE_HDR_LEN, curr_frag_len); - memcpy(skb->data, start, hdr_len); skb->len = curr_frag_len; if (curr_frag_len <= BE_HDR_LEN) { /* tiny packet */ + memcpy(skb->data, start, curr_frag_len); /* Complete packet has now been moved to data */ put_page(page_info->page); skb->data_len = 0; skb->tail += curr_frag_len; } else { + hdr_len = ETH_HLEN; + memcpy(skb->data, start, hdr_len); skb_shinfo(skb)->nr_frags = 1; skb_shinfo(skb)->frags[0].page = page_info->page; skb_shinfo(skb)->frags[0].page_offset =