Skip to content

Commit

Permalink
niu: fix skb truesize underestimation
Browse files Browse the repository at this point in the history
Add a 'truesize' argument to niu_rx_skb_append(), filled with rcr_size
by the caller to properly account frag sizes in skb->truesize

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Oct 14, 2011
1 parent 5e6c355 commit e7e5a40
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/net/ethernet/sun/niu.c
Original file line number Diff line number Diff line change
Expand Up @@ -3287,17 +3287,13 @@ static u16 tcam_get_valid_entry_cnt(struct niu *np)
}

static void niu_rx_skb_append(struct sk_buff *skb, struct page *page,
u32 offset, u32 size)
u32 offset, u32 size, u32 truesize)
{
int i = skb_shinfo(skb)->nr_frags;

__skb_fill_page_desc(skb, i, page, offset, size);
skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags, page, offset, size);

skb->len += size;
skb->data_len += size;
skb->truesize += size;

skb_shinfo(skb)->nr_frags = i + 1;
skb->truesize += truesize;
}

static unsigned int niu_hash_rxaddr(struct rx_ring_info *rp, u64 a)
Expand Down Expand Up @@ -3480,7 +3476,7 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
} else if (!(val & RCR_ENTRY_MULTI))
append_size = len - skb->len;

niu_rx_skb_append(skb, page, off, append_size);
niu_rx_skb_append(skb, page, off, append_size, rcr_size);
if ((page->index + rp->rbr_block_size) - rcr_size == addr) {
*link = (struct page *) page->mapping;
np->ops->unmap_page(np->device, page->index,
Expand Down

0 comments on commit e7e5a40

Please sign in to comment.