Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

[pandora-kernel.git] / arch / um / drivers / net_kern.c

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 47d0c37..a492e59 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -262,6 +262,15 @@ static int uml_net_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void uml_net_poll_controller(struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       uml_net_interrupt(dev->irq, dev);
+       enable_irq(dev->irq);
+}
+#endif
+
 static void uml_net_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
@@ -359,11 +368,14 @@ static const struct net_device_ops uml_netdev_ops = {
        .ndo_open               = uml_net_open,
        .ndo_stop               = uml_net_close,
        .ndo_start_xmit         = uml_net_start_xmit,
-       .ndo_set_multicast_list = uml_net_set_multicast_list,
+       .ndo_set_rx_mode        = uml_net_set_multicast_list,
        .ndo_tx_timeout         = uml_net_tx_timeout,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = uml_net_change_mtu,
        .ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller = uml_net_poll_controller,
+#endif
 };
 
 /*