From 049e344aaf78a8245e99b7abbe7812e52e59b36c Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 13 Oct 2011 06:31:02 +0000 Subject: [PATCH] --- yaml --- r: 266673 b: refs/heads/master c: bdb28a97f46b5307e6e9351de52a9dd03e711a2f h: refs/heads/master i: 266671: 8d5f24b84896a7ec6cdf459464ce0559e68299d9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 46798ac0e034..2a57ebaca0e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87fb4b7b533073eeeaed0b6bf7c2328995f6c075 +refs/heads/master: bdb28a97f46b5307e6e9351de52a9dd03e711a2f diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 816ce56de7ac..679b8041e43a 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -1071,6 +1071,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo, page_info->page_offset + hdr_len; skb_shinfo(skb)->frags[0].size = curr_frag_len - hdr_len; skb->data_len = curr_frag_len - hdr_len; + skb->truesize += rx_frag_size; skb->tail += hdr_len; } page_info->page = NULL; @@ -1103,7 +1104,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo, skb_shinfo(skb)->frags[j].size += curr_frag_len; skb->len += curr_frag_len; skb->data_len += curr_frag_len; - + skb->truesize += rx_frag_size; remaining -= curr_frag_len; index_inc(&rxcp->rxq_idx, rxq->len); page_info->page = NULL; @@ -1133,7 +1134,6 @@ static void be_rx_compl_process(struct be_adapter *adapter, else skb_checksum_none_assert(skb); - skb->truesize = skb->len + sizeof(struct sk_buff); skb->protocol = eth_type_trans(skb, netdev); if (adapter->netdev->features & NETIF_F_RXHASH) skb->rxhash = rxcp->rss_hash; @@ -1181,7 +1181,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter, put_page(page_info->page); } skb_shinfo(skb)->frags[j].size += curr_frag_len; - + skb->truesize += rx_frag_size; remaining -= curr_frag_len; index_inc(&rxcp->rxq_idx, rxq->len); memset(page_info, 0, sizeof(*page_info)); @@ -1191,7 +1191,6 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter, skb_shinfo(skb)->nr_frags = j + 1; skb->len = rxcp->pkt_size; skb->data_len = rxcp->pkt_size; - skb->truesize += rxcp->pkt_size; skb->ip_summed = CHECKSUM_UNNECESSARY; if (adapter->netdev->features & NETIF_F_RXHASH) skb->rxhash = rxcp->rss_hash;