Merge tag 'trace-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[cascardo/linux.git] / drivers / net / rionet.c
index a849718..dac7a0d 100644 (file)
@@ -494,7 +494,7 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
        ndev->mtu = RIO_MAX_MSG_SIZE - 14;
        ndev->features = NETIF_F_LLTX;
        SET_NETDEV_DEV(ndev, &mport->dev);
-       SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);
+       ndev->ethtool_ops = &rionet_ethtool_ops;
 
        spin_lock_init(&rnet->lock);
        spin_lock_init(&rnet->tx_lock);