diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/forcedeth.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index cda48c5d72a9..c93f3d08dc42 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1480,6 +1480,13 @@ static void nv_do_nic_poll(unsigned long data) | |||
1480 | enable_irq(dev->irq); | 1480 | enable_irq(dev->irq); |
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
1484 | static void nv_poll_controller(struct net_device *dev) | ||
1485 | { | ||
1486 | nv_do_nic_poll((unsigned long) dev); | ||
1487 | } | ||
1488 | #endif | ||
1489 | |||
1483 | static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1490 | static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1484 | { | 1491 | { |
1485 | struct fe_priv *np = get_nvpriv(dev); | 1492 | struct fe_priv *np = get_nvpriv(dev); |
@@ -1962,6 +1969,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
1962 | dev->get_stats = nv_get_stats; | 1969 | dev->get_stats = nv_get_stats; |
1963 | dev->change_mtu = nv_change_mtu; | 1970 | dev->change_mtu = nv_change_mtu; |
1964 | dev->set_multicast_list = nv_set_multicast; | 1971 | dev->set_multicast_list = nv_set_multicast; |
1972 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
1973 | dev->poll_controller = nv_poll_controller; | ||
1974 | #endif | ||
1965 | SET_ETHTOOL_OPS(dev, &ops); | 1975 | SET_ETHTOOL_OPS(dev, &ops); |
1966 | dev->tx_timeout = nv_tx_timeout; | 1976 | dev->tx_timeout = nv_tx_timeout; |
1967 | dev->watchdog_timeo = NV_WATCHDOG_TIMEO; | 1977 | dev->watchdog_timeo = NV_WATCHDOG_TIMEO; |