From 4bc72c26d82758fcaffca6675fa4905d4b6c7bc0 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 13 Oct 2011 07:50:19 +0000 Subject: [PATCH] --- yaml --- r: 266674 b: refs/heads/master c: a1f4e8bcbccf50cf1894c263af4d677d4f566533 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2a57ebaca0e3..e87e670706c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdb28a97f46b5307e6e9351de52a9dd03e711a2f +refs/heads/master: a1f4e8bcbccf50cf1894c263af4d677d4f566533 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c index 3c221be9d1e2..6ff7636e73a2 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c @@ -3051,7 +3051,6 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb, &skb_shinfo(skb)->frags[i - 1]; frag->size -= tail; skb->data_len -= tail; - skb->truesize -= tail; } return 0; } @@ -3083,7 +3082,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb, frag_size -= frag_len; skb->data_len += frag_len; - skb->truesize += frag_len; + skb->truesize += PAGE_SIZE; skb->len += frag_len; pg_prod = NEXT_RX_BD(pg_prod);