From: Eric Dumazet Date: Thu, 13 Oct 2011 11:30:52 +0000 (+0000) Subject: ftgmac100: fix skb truesize underestimation X-Git-Tag: MMI-PSA29.97-13-9~18194^2~92 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5935f81c595897d213afcf756e3e41af7c704f0e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ftgmac100: fix skb truesize underestimation ftgmac100 allocates a page per skb fragment. We must account PAGE_SIZE increments on skb->truesize, not the actual frag length. If frame is under 64 bytes, page is freed, and truesize adjusted. Signed-off-by: Eric Dumazet CC: Po-Yu Chuang Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 54709af917e9..fb5579a3b19d 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -467,7 +467,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) skb->len += size; skb->data_len += size; - skb->truesize += size; + skb->truesize += PAGE_SIZE; if (ftgmac100_rxdes_last_segment(rxdes)) done = true; @@ -478,6 +478,8 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) rxdes = ftgmac100_current_rxdes(priv); } while (!done); + if (skb->len <= 64) + skb->truesize -= PAGE_SIZE; __pskb_pull_tail(skb, min(skb->len, 64U)); skb->protocol = eth_type_trans(skb, netdev);