projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
net
/
rionet.c
diff --git
a/drivers/net/rionet.c
b/drivers/net/rionet.c
index
a849718
..
dac7a0d
100644
(file)
--- a/
drivers/net/rionet.c
+++ b/
drivers/net/rionet.c
@@
-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);
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);
spin_lock_init(&rnet->lock);
spin_lock_init(&rnet->tx_lock);