---

yaml --- r: 145276 b: refs/heads/master c: 4e2fd55 h: refs/heads/master v: v3
git-mirror · May 25, 2009 · d316eaa · d316eaa
1 parent 773a4a4
commit d316eaa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8
+refs/heads/master: 4e2fd555199977c5994d1a4d2d3b8761b20ca4c7
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
@@ -1885,8 +1885,17 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
 
 			if (unlikely(!newskb))
 				newskb = skb;
-			else if (skb)
+			else if (skb) {
+				/*
+				 * We need to reset ->data to what it
+				 * was before gfar_new_skb() re-aligned
+				 * it to an RXBUF_ALIGNMENT boundary
+				 * before we put the skb back on the
+				 * recycle list.
+				 */
+				skb->data = skb->head + NET_SKB_PAD;
 				__skb_queue_head(&priv->rx_recycle, skb);
+			}
 		} else {
 			/* Increment the number of packets */
 			dev->stats.rx_packets++;