Re: [PATCH] [-MM, FIX] ixgbe: incorporate napi_struct changes from net-2.6.24.git

[Andrew Morton]

On Wed, 12 Sep 2007 11:13:07 -0700
Auke Kok <[EMAIL PROTECTED]> wrote:

> This incorporates the new napi_struct changes into ixgbe.

I get a reject storm.

> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -557,14 +557,15 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void 
> *data)
>       struct ixgbe_adapter *adapter = rxr->adapter;
>  
>       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rxr->eims_value);
> -     netif_rx_schedule(adapter->netdev);
> +     netif_rx_schedule(adapter->netdev, &adapter->napi);
>       return IRQ_HANDLED;
>  }
>  

For example, my copy of ixgbe_msix_clean_rx(), from
git://lost.foo-projects.org/~aveerani/git/linux-2.6#ixgbe is:

static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
{
        struct ixgbe_ring *rxr = data;
        struct ixgbe_adapter *adapter = rxr->adapter;

#ifndef CONFIG_IXGBE_NAPI
        int i;

        for (i = 0; i < IXGBE_MAX_INTR; i++)
                if (unlikely(!ixgbe_clean_rx_irq(adapter, rxr)))
                        break;
#else
        IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rxr->eims_value);
        netif_rx_schedule(adapter->netdev);
#endif
        return IRQ_HANDLED;
}


which is quite different from the function whcih you're altering here?
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html