---

yaml
---
r: 315391
b: refs/heads/master
c: ac1ae5f
h: refs/heads/master
i:
  315389: 83269b4
  315387: 6817204
  315383: da8fc19
  315375: d4e257e
  315359: ad66dc0
  315327: 2e96044
  315263: cc1e2e3
  315135: 58b06f4
  314879: c7b75a6
  314367: 6de2581
  313343: 63050c9
  311295: de55070
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ee62e9b587b303e2ac430cfa7711be4da698f7
+refs/heads/master: ac1ae5f33fd225f46da0072e2091962410a0431b

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 =