Merge branch 'ethtool-master-slave'

Browse source

Oleksij Rempel says:

====================
provide support for PHY master/slave configuration

changes v6:
- use NL_SET_ERR_MSG_ATTR in ethnl_update_linkmodes
- add sanity checks in the ioctl interface
- use bool for ethnl_validate_master_slave_cfg()

changes v5:
- set MASTER_SLAVE_CFG_UNSUPPORTED as default value
- send a netlink error message on validation error
- more code fixes

changes v4:
- rename port_mode to master_slave
- move validation code to net/ethtool/linkmodes.c
- add UNSUPPORTED state and avoid sending unsupported fields
- more formatting and naming fixes
- tja11xx: support only force mode
- tja11xx: mark state as unsupported

changes v3:
- provide separate field for config and state.
- make state rejected on set
- add validation

changes v2:
- change names. Use MASTER_PREFERRED instead of MULTIPORT
- configure master/slave only on request. Default configuration can be
  provided by PHY or eeprom
- status and configuration to the user space.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-05-06 17:45:45 -07:00

parent 3d59a5837c b883e47bde

commit 9e330bf469

10 changed files with 240 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

35

Documentation/networking/ethtool-netlink.rst

View file

43

drivers/net/phy/nxp-tja11xx.c

View file

4

drivers/net/phy/phy.c

View file

94

drivers/net/phy/phy_device.c

View file

3

include/linux/phy.h

View file

16

include/uapi/linux/ethtool.h

View file

2

include/uapi/linux/ethtool_netlink.h

View file

2

include/uapi/linux/mii.h

View file

6

net/ethtool/ioctl.c

View file

53

net/ethtool/linkmodes.c

View file