diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-10-13 11:30:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-13 22:25:20 -0400 |
| commit | 5935f81c595897d213afcf756e3e41af7c704f0e (patch) | |
| tree | 50e47acd398d7c865134fa3dd54e51830b3563ac /drivers/net/ethernet/faraday | |
| parent | 7ae60b3f3b297b7f04025c93f1cb2275c3a1dfcd (diff) | |
| download | linux-5935f81c595897d213afcf756e3e41af7c704f0e.tar.gz linux-5935f81c595897d213afcf756e3e41af7c704f0e.tar.xz | |
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 <eric.dumazet@gmail.com>
CC: Po-Yu Chuang <ratbert@faraday-tech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |