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 22745b4..a492e59 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -368,7 +368,7 @@ 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,