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

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

[Florian Fainelli]

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;
 }

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

[Ralf Baechle]

On Sun, May 31, 2009 at 08:31:34PM +0200, Florian Fainelli wrote:

> 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>

Folded into the "MIPS: BCM63XX: Add integrated ethernet mac support."
patch.

You should eventually run this patch by the network maintainers.  It's
a driver patch so I won't merge it upstream unless it's been acked by one
of the network guys.

Thanks,

  Ralf

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

[Florian Fainelli]

[-- Attachment #1: Type: text/plain, Size: 906 bytes --]

Le Monday 01 June 2009 16:55:52 Ralf Baechle, vous avez écrit :
> On Sun, May 31, 2009 at 08:31:34PM +0200, Florian Fainelli wrote:
> > 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>
>
> Folded into the "MIPS: BCM63XX: Add integrated ethernet mac support."
> patch.

Thanks.

>
> You should eventually run this patch by the network maintainers.  It's
> a driver patch so I won't merge it upstream unless it's been acked by one
> of the network guys.

Actually Maxime already submitted those patches, without much answer from the 
network guys so I guess they just skipped it.
-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

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

[Ralf Baechle]

On Mon, Jun 01, 2009 at 05:02:38PM +0200, Florian Fainelli wrote:

> > You should eventually run this patch by the network maintainers.  It's
> > a driver patch so I won't merge it upstream unless it's been acked by one
> > of the network guys.
> 
> Actually Maxime already submitted those patches, without much answer from the 
> network guys so I guess they just skipped it.

Patches do get dropped so just resubmit until you get an ACK or NACK.

  Ralf