aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/faraday
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-10-13 07:30:52 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-13 22:25:20 -0400
commit5935f81c595897d213afcf756e3e41af7c704f0e (patch)
tree50e47acd398d7c865134fa3dd54e51830b3563ac /drivers/net/ethernet/faraday
parent7ae60b3f3b297b7f04025c93f1cb2275c3a1dfcd (diff)
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.c4
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)
467 467
468 skb->len += size; 468 skb->len += size;
469 skb->data_len += size; 469 skb->data_len += size;
470 skb->truesize += size; 470 skb->truesize += PAGE_SIZE;
471 471
472 if (ftgmac100_rxdes_last_segment(rxdes)) 472 if (ftgmac100_rxdes_last_segment(rxdes))
473 done = true; 473 done = true;
@@ -478,6 +478,8 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed)
478 rxdes = ftgmac100_current_rxdes(priv); 478 rxdes = ftgmac100_current_rxdes(priv);
479 } while (!done); 479 } while (!done);
480 480
481 if (skb->len <= 64)
482 skb->truesize -= PAGE_SIZE;
481 __pskb_pull_tail(skb, min(skb->len, 64U)); 483 __pskb_pull_tail(skb, min(skb->len, 64U));
482 skb->protocol = eth_type_trans(skb, netdev); 484 skb->protocol = eth_type_trans(skb, netdev);
483 485