---

yaml --- r: 119249 b: refs/heads/master c: 11b4aa0 h: refs/heads/master i: 119247: 3b47f33 v: v3
git-mirror · Nov 20, 2008 · 4d304d3 · 4d304d3
1 parent 352c8c1
commit 4d304d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);