From 8b17c743768470519fda66e6562272cdb033e178 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 21 Jul 2009 11:48:08 +0000 Subject: [PATCH] make the ethernet driver compile with newer kernels SVN-Revision: 16942 --- .../brcm63xx/files/drivers/net/bcm63xx_enet.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c index 7dad43db99b..0c6562bb420 100644 --- a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c +++ b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "bcm63xx_enet.h" @@ -451,7 +452,11 @@ 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); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + netif_rx_schedule(dev, napi); +#else + napi_complete(napi); +#endif /* restore rx/tx interrupt */ enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK, @@ -503,7 +508,11 @@ 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); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + netif_rx_schedul(dev, &priv->napi); +#else + napi_schedule(&priv->napi); +#endif return IRQ_HANDLED; } @@ -1709,7 +1718,11 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev) if (priv->has_phy) { bus = &priv->mii_bus; bus->name = "bcm63xx_enet MII bus"; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) bus->dev = &pdev->dev; +#else + bus->parent = &pdev->dev; +#endif bus->priv = priv; bus->read = bcm_enet_mdio_read_phylib; bus->write = bcm_enet_mdio_write_phylib; -- 2.30.2