Merge remote-tracking branch 'net/master'

[karo-tx-linux.git] / drivers / net / ethernet / renesas / sh_eth.c

diff --git a/drivers/net/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
similarity index 99%
rename from drivers/net/sh_eth.c
rename to drivers/net/ethernet/renesas/sh_eth.c
index 1c1666e99106eb8ed09ab7e0f8290abd74cb8727..4479a45f7329c8c75a9eaf6af1438e62cb72a1a4 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1760,7 +1760,7 @@ static const struct net_device_ops sh_eth_netdev_ops = {
        .ndo_start_xmit         = sh_eth_start_xmit,
        .ndo_get_stats          = sh_eth_get_stats,
 #if defined(SH_ETH_HAS_TSU)
-       .ndo_set_multicast_list = sh_eth_set_multicast_list,
+       .ndo_set_rx_mode        = sh_eth_set_multicast_list,
 #endif
        .ndo_tx_timeout         = sh_eth_tx_timeout,
        .ndo_do_ioctl           = sh_eth_do_ioctl,