Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / zd1201.c

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 415eec401e2e5aa55be1f4f688f90ef7f50785a2..8efa2f2d95797488f189de5a6d433ffe2e8fa3bc 100644 (file)
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1722,7 +1722,7 @@ static const struct net_device_ops zd1201_netdev_ops = {
        .ndo_stop               = zd1201_net_stop,
        .ndo_start_xmit         = zd1201_hard_start_xmit,
        .ndo_tx_timeout         = zd1201_tx_timeout,
-       .ndo_set_multicast_list = zd1201_set_multicast,
+       .ndo_set_rx_mode        = zd1201_set_multicast,
        .ndo_set_mac_address    = zd1201_set_mac_address,
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_validate_addr      = eth_validate_addr,