Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / sfc / falcon / efx.c

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index d7912c7..423bdf8 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2219,7 +2219,7 @@ static const struct net_device_ops ef4_netdev_ops = {
        .ndo_tx_timeout         = ef4_watchdog,
        .ndo_start_xmit         = ef4_hard_start_xmit,
        .ndo_validate_addr      = eth_validate_addr,
-       .ndo_do_ioctl           = ef4_ioctl,
+       .ndo_eth_ioctl          = ef4_ioctl,
        .ndo_change_mtu         = ef4_change_mtu,
        .ndo_set_mac_address    = ef4_set_mac_address,
        .ndo_set_rx_mode        = ef4_set_rx_mode,