diff --git a/[refs] b/[refs]
index b55722ae845f..1811bc3aaa3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98b9040c747e50fe02ad616c9d5fee9aa4017cd1
+refs/heads/master: b21606a773faffc2b3ec326325c433bdf37ecbdf
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
index 0eeff1add882..d779a0b9d456 100644
--- a/trunk/drivers/net/spider_net.c
+++ b/trunk/drivers/net/spider_net.c
@@ -1628,8 +1628,10 @@ spider_net_open(struct net_device *netdev)
 	if (spider_net_init_chain(card, &card->tx_chain, card->descr,
 			PCI_DMA_TODEVICE, card->tx_desc))
 		goto alloc_tx_failed;
+
+	/* rx_chain is after tx_chain, so offset is descr + tx_count */
 	if (spider_net_init_chain(card, &card->rx_chain,
-			card->descr + card->rx_desc,
+			card->descr + card->tx_desc,
 			PCI_DMA_FROMDEVICE, card->rx_desc))
 		goto alloc_rx_failed;