diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-06 17:45:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-06 17:45:45 -0700 |
| commit | 9e330bf469e02e64d46cb150a2ec65310b9412ea (patch) | |
| tree | fc04060f03d67fca8157b07d648bd7113e6d914b /include/uapi/linux/mii.h | |
| parent | Merge branch 'chcr-next' (diff) | |
| parent | net: phy: tja11xx: add support for master-slave configuration (diff) | |
| download | wireguard-linux-9e330bf469e02e64d46cb150a2ec65310b9412ea.tar.xz wireguard-linux-9e330bf469e02e64d46cb150a2ec65310b9412ea.zip | |
Merge branch 'ethtool-master-slave'
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>
Diffstat (limited to 'include/uapi/linux/mii.h')
| -rw-r--r-- | include/uapi/linux/mii.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/mii.h b/include/uapi/linux/mii.h index 90f9b4e1ba27..39f7c44baf53 100644 --- a/include/uapi/linux/mii.h +++ b/include/uapi/linux/mii.h @@ -151,11 +151,13 @@ /* 1000BASE-T Control register */ #define ADVERTISE_1000FULL 0x0200 /* Advertise 1000BASE-T full duplex */ #define ADVERTISE_1000HALF 0x0100 /* Advertise 1000BASE-T half duplex */ +#define CTL1000_PREFER_MASTER 0x0400 /* prefer to operate as master */ #define CTL1000_AS_MASTER 0x0800 #define CTL1000_ENABLE_MASTER 0x1000 /* 1000BASE-T Status register */ #define LPA_1000MSFAIL 0x8000 /* Master/Slave resolution failure */ +#define LPA_1000MSRES 0x4000 /* Master/Slave resolution status */ #define LPA_1000LOCALRXOK 0x2000 /* Link partner local receiver status */ #define LPA_1000REMRXOK 0x1000 /* Link partner remote receiver status */ #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ |