Merge remote-tracking branch 'net/master'

[karo-tx-linux.git] / drivers / infiniband / ulp / ipoib / ipoib_main.c

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index fe89c4660d555fc821b8908c28a92ec208ca3070..7567b60002309a19a2d0a4cc13da855a46042be4 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -998,7 +998,7 @@ static const struct net_device_ops ipoib_netdev_ops = {
        .ndo_fix_features        = ipoib_fix_features,
        .ndo_start_xmit          = ipoib_start_xmit,
        .ndo_tx_timeout          = ipoib_timeout,
-       .ndo_set_multicast_list  = ipoib_set_mcast_list,
+       .ndo_set_rx_mode         = ipoib_set_mcast_list,
        .ndo_neigh_setup         = ipoib_neigh_setup_dev,
 };