From 4060630395888d9632c248f0237baff3318e41c1 Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@austin.ibm.com>
Date: Mon, 5 Feb 2007 16:29:43 -0800
Subject: [PATCH] --- yaml --- r: 46587 b: refs/heads/master c:
 d9a9720eab7437aa7f34dcbb92bb4bc8cc36bba9 h: refs/heads/master i:   46585:
 46434dc6b94604ea5ad363f1948f5755d8248aff   46583:
 5c649417df92dae882d7f2523639867c3d8f4cb7 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/spider_net.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e8dd070bf685..263c3e13e998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e36bfa9ffa2f6097b622ba07a95d823db553e4
+refs/heads/master: d9a9720eab7437aa7f34dcbb92bb4bc8cc36bba9
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
index d73018b5cfc8..bf6ff39e02bb 100644
--- a/trunk/drivers/net/spider_net.c
+++ b/trunk/drivers/net/spider_net.c
@@ -419,9 +419,13 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
 		card->spider_stats.rx_iommu_map_error++;
 		descr->dmac_cmd_status = SPIDER_NET_DESCR_NOT_IN_USE;
 	} else {
+		descr->next_descr_addr = 0;
 		wmb();
 		descr->dmac_cmd_status = SPIDER_NET_DESCR_CARDOWNED |
 					 SPIDER_NET_DMAC_NOINTR_COMPLETE;
+
+		wmb();
+		descr->prev->next_descr_addr = descr->bus_addr;
 	}
 
 	return 0;
@@ -1650,7 +1654,6 @@ int
 spider_net_open(struct net_device *netdev)
 {
 	struct spider_net_card *card = netdev_priv(netdev);
-	struct spider_net_descr *descr;
 	int result;
 
 	result = spider_net_init_chain(card, &card->tx_chain);
@@ -1662,13 +1665,6 @@ spider_net_open(struct net_device *netdev)
 	if (result)
 		goto alloc_rx_failed;
 
-	/* Make a ring of of bus addresses */
-	descr = card->rx_chain.ring;
-	do {
-		descr->next_descr_addr = descr->next->bus_addr;
-		descr = descr->next;
-	} while (descr != card->rx_chain.ring);
-
 	/* Allocate rx skbs */
 	if (spider_net_alloc_rx_skbs(card))
 		goto alloc_skbs_failed;