From 89dbefc855f62bc2277a18196e02b51742014349 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 13 Dec 2006 15:19:54 -0600 Subject: [PATCH] --- yaml --- r: 46519 b: refs/heads/master c: a4182c50bcd6a20caae82c202436fe892f642150 h: refs/heads/master i: 46517: bb4da104c2b6ebc769a1dcb221ffb8688b0a6000 46515: 12e3c66bf8c6844dcea8f18dc1dff9a115fadc3c 46511: e6d4aaef39a64bac9f4ce9084ea9db18479d295c v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 25f37acbd148..c30ea2f177c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80dab7c7e5b7c4e53e9423c22375bfd9cbf7f2c3 +refs/heads/master: a4182c50bcd6a20caae82c202436fe892f642150 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index f58741239196..96a7e771daa4 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -367,21 +367,20 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card) } /** - * spider_net_prepare_rx_descr - reinitializes a rx descriptor + * spider_net_prepare_rx_descr - Reinitialize RX descriptor * @card: card structure * @descr: descriptor to re-init * - * return 0 on succes, <0 on failure + * Return 0 on succes, <0 on failure. * - * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. - * Activate the descriptor state-wise + * Allocates a new rx skb, iommu-maps it and attaches it to the + * descriptor. Mark the descriptor as activated, ready-to-use. */ static int spider_net_prepare_rx_descr(struct spider_net_card *card, struct spider_net_descr *descr) { dma_addr_t buf; - int error = 0; int offset; int bufsize; @@ -409,7 +408,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card, (SPIDER_NET_RXBUF_ALIGN - 1); if (offset) skb_reserve(descr->skb, SPIDER_NET_RXBUF_ALIGN - offset); - /* io-mmu-map the skb */ + /* iommu-map the skb */ buf = pci_map_single(card->pdev, descr->skb->data, SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE); descr->buf_addr = buf; @@ -424,7 +423,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card, SPIDER_NET_DMAC_NOINTR_COMPLETE; } - return error; + return 0; } /**