projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux...
[deliverable/linux.git]
/
drivers
/
staging
/
octeon
/
ethernet.c
diff --git
a/drivers/staging/octeon/ethernet.c
b/drivers/staging/octeon/ethernet.c
index ff7214aac9dd6ed05c524c69fa23e35767d2dcce..da9dd6bc56600f2fe094df6a59d3836ad491be72 100644
(file)
--- a/
drivers/staging/octeon/ethernet.c
+++ b/
drivers/staging/octeon/ethernet.c
@@
-469,7
+469,7
@@
int cvm_oct_common_init(struct net_device *dev)
/* We do our own locking, Linux doesn't need to */
dev->features |= NETIF_F_LLTX;
-
SET_ETHTOOL_OPS(dev, &cvm_oct_ethtool_ops)
;
+
dev->ethtool_ops = &cvm_oct_ethtool_ops
;
cvm_oct_phy_setup_device(dev);
cvm_oct_set_mac_filter(dev);
This page took
0.024576 seconds
and
5
git commands to generate.