* [PATCH] fs_enet: fix polling
@ 2008-11-02 14:49 Alexey Dobriyan
2008-11-03 20:26 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Dobriyan @ 2008-11-02 14:49 UTC (permalink / raw)
To: jgarzik; +Cc: Vitaly Bordug, Scott Wood, netdev
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);
}
#endif
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] fs_enet: fix polling
2008-11-02 14:49 [PATCH] fs_enet: fix polling Alexey Dobriyan
@ 2008-11-03 20:26 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-11-03 20:26 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Vitaly Bordug, Scott Wood, netdev
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-03 20:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-02 14:49 [PATCH] fs_enet: fix polling Alexey Dobriyan
2008-11-03 20:26 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).