From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeff Garzik <jgarzik@pobox.com>
Subject: Re: [PATCH] fs_enet: fix polling
Date: Mon, 03 Nov 2008 15:26:01 -0500
Message-ID: <490F5E59.6090106@pobox.com>
References: <20081102144959.GA10869@x200.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Vitaly Bordug <vitb@kernel.crashing.org>,
	Scott Wood <scottwood@freescale.com>, netdev@vger.kernel.org
To: Alexey Dobriyan <adobriyan@gmail.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from srv5.dvmed.net ([207.36.208.214]:49698 "EHLO mail.dvmed.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755037AbYKCU0V (ORCPT <rfc822;netdev@vger.kernel.org>);
	Mon, 3 Nov 2008 15:26:21 -0500
In-Reply-To: <20081102144959.GA10869@x200.localdomain>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

Alexey Dobriyan wrote:
> 1. compile fix for irqreturn_t type change
> 2. restore ->poll_controller after CONFIG_PPC_CPM_NEW_BINDING transition
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
> 
>  drivers/net/fs_enet/fs_enet-main.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> --- a/drivers/net/fs_enet/fs_enet-main.c
> +++ b/drivers/net/fs_enet/fs_enet-main.c
> @@ -1099,7 +1099,9 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
>  	ndev->stop = fs_enet_close;
>  	ndev->get_stats = fs_enet_get_stats;
>  	ndev->set_multicast_list = fs_set_multicast_list;
> -
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +	ndev->poll_controller = fs_enet_netpoll;
> +#endif
>  	if (fpi->use_napi)
>  		netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi,
>  		               fpi->napi_weight);
> @@ -1209,7 +1211,7 @@ static void __exit fs_cleanup(void)
>  static void fs_enet_netpoll(struct net_device *dev)
>  {
>         disable_irq(dev->irq);
> -       fs_enet_interrupt(dev->irq, dev, NULL);
> +       fs_enet_interrupt(dev->irq, dev);
>         enable_irq(dev->irq);
>  }

applied