Subject: Re: [PATCH 1/2] e1000: fix netpoll with NAPI

From: "John W. Linville" <[email-masked]>
Date: Wed, 7 Jun 2006 14:54:44 -0400

On Wed, Jun 07, 2006 at 11:25:29AM -0700, Auke Kok wrote:

> @@ -4584,10 +4584,25 @@ static void
>  e1000_netpoll(struct net_device *netdev)
>  {
>         struct e1000_adapter *adapter = netdev_priv(netdev);
> +#ifdef CONFIG_E1000_NAPI
> +       int budget = 0;
> +
> +       disable_irq(adapter->pdev->irq);
> +       if (likely(netif_rx_schedule_prep(&adapter->polling_netdev[0]))) {
> +               if (spin_trylock(&adapter->tx_queue_lock)) {
> +                       e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]);
> +                       spin_unlock(&adapter->tx_queue_lock);
> +               }
> +               adapter->clean_rx(adapter, adapter->rx_ring,
> +                               &budget, netdev->weight);
> +               clear_bit(__LINK_STATE_RX_SCHED,
> +                               &adapter->polling_netdev[0].state);
> +       }
> +#else
> +
>         disable_irq(adapter->pdev->irq);

Pedantic objection, but I think this would read easier w/o the extra
newline before disable_irq.

John
-- 
John W. Linville
[email-masked]