From 05db43d62bded8b079c278747064c3627ea4e37b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 13 Oct 2011 11:30:52 +0000 Subject: [PATCH] --- yaml --- r: 266680 b: refs/heads/master c: 5935f81c595897d213afcf756e3e41af7c704f0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/faraday/ftgmac100.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79d02f1f7df0..6febe8a54814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ae60b3f3b297b7f04025c93f1cb2275c3a1dfcd +refs/heads/master: 5935f81c595897d213afcf756e3e41af7c704f0e diff --git a/trunk/drivers/net/ethernet/faraday/ftgmac100.c b/trunk/drivers/net/ethernet/faraday/ftgmac100.c index 54709af917e9..fb5579a3b19d 100644 --- a/trunk/drivers/net/ethernet/faraday/ftgmac100.c +++ b/trunk/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);