Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / drivers / staging / wlan-ng / p80211netdev.c

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index b0af292..14bfeb2 100644 (file)
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -715,7 +715,7 @@ static const struct net_device_ops p80211_netdev_ops = {
        .ndo_stop = p80211knetdev_stop,
        .ndo_get_stats = p80211knetdev_get_stats,
        .ndo_start_xmit = p80211knetdev_hard_start_xmit,
-       .ndo_set_multicast_list = p80211knetdev_set_multicast_list,
+       .ndo_set_rx_mode = p80211knetdev_set_multicast_list,
        .ndo_do_ioctl = p80211knetdev_do_ioctl,
        .ndo_set_mac_address = p80211knetdev_set_mac_address,
        .ndo_tx_timeout = p80211knetdev_tx_timeout,