From: Florian Fainelli <florian@openwrt.org>
To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>,
Maxime Bizon <mbizon@freebox.fr>
Subject: [PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c
Date: Sun, 31 May 2009 20:31:34 +0200 [thread overview]
Message-ID: <200905312031.35241.florian@openwrt.org> (raw)
This patch makes the ethernet driver compile again
after commit 908a7a1. netif_rx_schedule became
napi_schedule and __netif_rx_complete became
__napi_rx_complete.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 39f7b67..a91f909 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -450,7 +450,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
/* no more packet in rx/tx queue, remove device from poll
* queue */
- __netif_rx_complete(dev, napi);
+ __napi_complete(napi);
/* restore rx/tx interrupt */
enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
@@ -502,7 +502,7 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id)
enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->rx_chan));
enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
- netif_rx_schedule(dev, &priv->napi);
+ napi_schedule(&priv->napi);
return IRQ_HANDLED;
}
next reply other threads:[~2009-05-31 18:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-31 18:31 Florian Fainelli [this message]
2009-06-01 14:55 ` [PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c Ralf Baechle
2009-06-01 15:02 ` Florian Fainelli
2009-06-02 9:25 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200905312031.35241.florian@openwrt.org \
--to=florian@openwrt.org \
--cc=linux-mips@linux-mips.org \
--cc=mbizon@freebox.fr \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.