projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sti-fixes-for-v3.16-rc1' of git://git.stlinux.com/devel/kernel/linux-sti...
[firefly-linux-kernel-4.4.55.git]
/
net
/
dsa
/
slave.c
diff --git
a/net/dsa/slave.c
b/net/dsa/slave.c
index 02c0e1716f641c947a5b906ee82c755e568a4a7c..64c5af0a10dd82169ccada3d82baa866a5b82cc8 100644
(file)
--- a/
net/dsa/slave.c
+++ b/
net/dsa/slave.c
@@
-346,7
+346,7
@@
dsa_slave_create(struct dsa_switch *ds, struct device *parent,
return slave_dev;
slave_dev->features = master->vlan_features;
-
SET_ETHTOOL_OPS(slave_dev, &dsa_slave_ethtool_ops)
;
+
slave_dev->ethtool_ops = &dsa_slave_ethtool_ops
;
eth_hw_addr_inherit(slave_dev, master);
slave_dev->tx_queue_len = 0;