ftgmac100: fix skb truesize underestimation
authorEric Dumazet <eric.dumazet@gmail.com>
Thu, 13 Oct 2011 11:30:52 +0000 (11:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Oct 2011 02:25:20 +0000 (22:25 -0400)
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>
drivers/net/ethernet/faraday/ftgmac100.c

index 54709af..fb5579a 100644 (file)
@@ -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);