linux-mips
[Top] [All Lists]

[PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c

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
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 31 May 2009 20:31:34 +0200
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:content-type :content-transfer-encoding:content-disposition:message-id; bh=37p5ahW21EGH+z7klRO7fS6R7QdOIgsTGCM5I/8dfgA=; b=D6hvB3KXY1CJVx73Drwb6zvOJ8rkbcIDT0MPcGZ3fykyouOKuWUMTlcweQ5Z28qQIu UuzOXnBq8ps/I5V7A6ylyExQJwxu31//qRMagR1fMa0PyLd6qHCjYYUBq2J3leLQCJ1P ZNMXJrpiwNpwR1wcyRHXuPFdC/dQZCOv7OzCk=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to :content-type:content-transfer-encoding:content-disposition :message-id; b=UtoGZQqwDvX6gts1iU9vjmJWliTLBvqhhO/1nO2ZGmurHSIjHVuKkPx8QBYEj/P3+T ENKkOb1A6QYMwap/Y/FQ6IzB+e2twE8p2jwjwHi/C5b9S475GJHNsCSOanAkDg9Kgxc/ UH105tHRljPFeHOs9KfTDwu5nfwjAOhSXyf80=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
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;
 }

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c, Florian Fainelli <=