Skip to contentSkip to conversation

bcm63xx: compile fixes for bcm63xx_enet.c

PATCH In review Florian Fainelli 2 participants 4 messages May 31, 2009 – Jun 2, 2009

Subsystems (2)
Network drivers MIPS
lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

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

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 <[email protected]>

---

drivers/net/bcm63xx_enet.c +2 -2
index 39f7b67..a91f909 100644
@@ -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;
 }
#1 lore raw
Quoted 6 lines · 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 <[email protected]>

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

author
#2 lore raw

Le Monday 01 June 2009 16:55:52 Ralf Baechle, vous avez écrit :

Quoted 10 lines · Florian Fainelli
Quoted 6 lines

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 <[email protected]>

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

Thanks.

Quoted 4 lines

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.

Signature · 4 lines
Best regards, Florian Fainelli
Email : [email protected]
http://openwrt.org
-------------------------------
#3 lore raw
Quoted 6 lines · Florian Fainelli
Quoted 3 lines

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