]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mv643xx_eth: fix recycle check bound
authorLennert Buytenhek <buytenh@wantstofly.org>
Tue, 18 Nov 2008 04:28:58 +0000 (04:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Nov 2008 09:39:52 +0000 (01:39 -0800)
When mv643xx_eth allocates skbuffs, it adds
'dma_get_cache_alignment() - 1' to the length it needs, so that it can
align the skb's ->data pointer to a cache boundary.  When checking
whether a transmitted skbuff can be reused as a receive buffer, these
bytes needs to be included into the minimum bound for the recycle check.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/mv643xx_eth.c

index baa7e845a0114aa7ffbdddb8b44300e93541a027..e513f76f2a9f6d1cd55cc8d190d679b36f5872da 100644 (file)
@@ -899,7 +899,8 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force)
                if (skb != NULL) {
                        if (skb_queue_len(&mp->rx_recycle) <
                                        mp->default_rx_ring_size &&
-                           skb_recycle_check(skb, mp->skb_size))
+                           skb_recycle_check(skb, mp->skb_size +
+                                       dma_get_cache_alignment() - 1))
                                __skb_queue_head(&mp->rx_recycle, skb);
                        else
                                dev_kfree_skb(skb);