[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / brcm63xx / files / drivers / net / bcm63xx_enet.c

diff --git a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
index 0c6562b..d338bbc 100644 (file)
--- a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
+++ b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
@@ -453,7 +453,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
        /* no more packet in rx/tx queue, remove device from poll
         * queue */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
        /* no more packet in rx/tx queue, remove device from poll
         * queue */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)

-       netif_rx_schedule(dev, napi);
+       netif_rx_complete(dev, napi);

 #else
        napi_complete(napi);
 #endif
 #else
        napi_complete(napi);
 #endif


@@ -509,7 +509,7 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id)
        enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
        enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)

-       netif_rx_schedul(dev, &priv->napi);
+       netif_rx_schedule(dev, &priv->napi);

 #else
        napi_schedule(&priv->napi);
 #endif
 #else
        napi_schedule(&priv->napi);
 #endif


@@ -1718,7 +1718,7 @@ 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 (priv->has_phy) {
                bus = &priv->mii_bus;
                bus->name = "bcm63xx_enet MII bus";

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)

                bus->dev = &pdev->dev;
 #else
                bus->parent = &pdev->dev;
                bus->dev = &pdev->dev;
 #else
                bus->parent = &pdev->dev;