Skip to content

Commit

Permalink
Spidernet: Rework RX linked list
Browse files Browse the repository at this point in the history
Make the hardware perceive the RX descriptor ring as a null-terminated linked
list, instead of a circular ring.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Linas Vepstas authored and Jeff Garzik committed Feb 7, 2007
1 parent b7e36bf commit d9a9720
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/net/spider_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit d9a9720

Please sign in to comment.