diff options
author | David S. Miller <davem@davemloft.net> | 2016-06-08 11:23:42 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-08 11:23:42 -0700 |
commit | 8fa956e32c998289c5bc0bc06eb3dc7a5cc11ce8 (patch) | |
tree | e12125301d6d5b2edd6f92c62539a509b89efe56 /scripts/setlocalversion | |
parent | 123b36526592f009bf8eccb7c8833aeda296d9cf (diff) | |
parent | 461cd1b03e321e9c4ed1b831c80965c69a7b761b (diff) |
Merge branch 'dsa-misc-improvements'
Florian Fainelli says:
====================
net: dsa: misc improvements
This patch series builds on top of Andrew's "New DSA bind, switches as devices"
patch set and does the following:
- add a few helper functions/goodies for net/dsa/dsa2.c to be as close as possible
from net/dsa/dsa.c in terms of what drivers can expect, in particular the slave
MDIO bus and the enabled_port_mask and phy_mii_mask
- fix the CPU port ethtools ops to work in a multiple tree setup since we can
no longer assume a single tree is supported
- make the bcm_sf2 driver register its own MDIO bus, yet assign it to
ds->slave_mii_bus for everything to work in net/dsa/slave.c wrt. PHY probing,
this is a tad cleaner than what we have now
Changes in v2:
Most of the previous patches have been dropped to just keep the relevant ones
now.
Changes in v3:
- split the addition of the slave MII bus as a separate patch
- properly unwind all operations at the right place and right time (ethtool ops,
slave MDIO bus
- fixed a few typos here and there
Changes in v4:
- removed superfluous dst agrument to dsa_cpu_port_ethtool_{setup,restore}
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/setlocalversion')
0 files changed, 0 insertions, 0 deletions