From 759ec0d58a0b327959a09290fe1a308eaff7007d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 13 Jul 2012 03:19:41 +0000 Subject: [PATCH] --- yaml --- r: 315391 b: refs/heads/master c: ac1ae5f33fd225f46da0072e2091962410a0431b h: refs/heads/master i: 315389: 83269b49e0e33847d28cd2c2a6777a1b73d621a6 315387: 68172041e0456717c4895af1f0835fd25a14f692 315383: da8fc19460f2bb99377b451dc030b38c4fec8035 315375: d4e257e3a9f0dd2cd9d9eb59600855cbbecf64bf 315359: ad66dc0d73ca4e086028e34fb07aaabb95ebe740 315327: 2e96044bfc0eeb97d303165262c90edacd188a4e 315263: cc1e2e34ca247c8c6134bf312244e177fa4477bb 315135: 58b06f4337562b8c5389a43beb6387878f579e88 314879: c7b75a64431d43d5c2a7920b9692843b4dca40b9 314367: 6de25810a3e400c22694f8f42a9e4472cca98f4b 313343: 63050c95227e116ed259ee1b3546d4d55151c917 311295: de550706fd0d95da2db70795dad6a9a747602e17 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 23d24d18e87a..fd88587ff828 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2ee62e9b587b303e2ac430cfa7711be4da698f7 +refs/heads/master: ac1ae5f33fd225f46da0072e2091962410a0431b diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 7e989d06523f..f18375cd75ee 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -1228,16 +1228,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_frag_set_page(skb, 0, page_info->page); skb_shinfo(skb)->frags[0].page_offset =