From 4d304d326db26768afc08ad4fa1c57c1f033b2a2 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Tue, 18 Nov 2008 04:28:58 +0000
Subject: [PATCH] --- yaml --- r: 119249 b: refs/heads/master c:
 11b4aa03b212cbaa969df25e723fbd400a6e24b9 h: refs/heads/master i:   119247:
 3b47f332e6765484c86603ecdf0ee7b8568ccd99 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07d64e25cbb3..269406b1ee03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcb3336ce4354395e38df7e2da110fca61f86a84
+refs/heads/master: 11b4aa03b212cbaa969df25e723fbd400a6e24b9
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index baa7e845a011..e513f76f2a9f 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -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);