Commit 7385d595 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Jeff Garzik

fs_enet: fix polling

1. compile fix for irqreturn_t type change
2. restore ->poll_controller after CONFIG_PPC_CPM_NEW_BINDING transition
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a1caa322
...@@ -1099,7 +1099,9 @@ static int __devinit fs_enet_probe(struct of_device *ofdev, ...@@ -1099,7 +1099,9 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
ndev->stop = fs_enet_close; ndev->stop = fs_enet_close;
ndev->get_stats = fs_enet_get_stats; ndev->get_stats = fs_enet_get_stats;
ndev->set_multicast_list = fs_set_multicast_list; ndev->set_multicast_list = fs_set_multicast_list;
#ifdef CONFIG_NET_POLL_CONTROLLER
ndev->poll_controller = fs_enet_netpoll;
#endif
if (fpi->use_napi) if (fpi->use_napi)
netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi, netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi,
fpi->napi_weight); fpi->napi_weight);
...@@ -1209,7 +1211,7 @@ static void __exit fs_cleanup(void) ...@@ -1209,7 +1211,7 @@ static void __exit fs_cleanup(void)
static void fs_enet_netpoll(struct net_device *dev) static void fs_enet_netpoll(struct net_device *dev)
{ {
disable_irq(dev->irq); disable_irq(dev->irq);
fs_enet_interrupt(dev->irq, dev, NULL); fs_enet_interrupt(dev->irq, dev);
enable_irq(dev->irq); enable_irq(dev->irq);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment