diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2020-06-09 16:26:53 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2020-06-18 12:13:36 +0200 |
| commit | f76b348ec78fb7316bbcc981127ae8894cfcc609 (patch) | |
| tree | fbc7a9d300fa0367ae3d93580dfa2493d20649b8 /include/standard-headers/linux/ethtool.h | |
| parent | 26bf4a29213b432eb390726c698a1915550a9cf9 (diff) | |
Linux headers: update
Update against Linux 5.8-rc1.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'include/standard-headers/linux/ethtool.h')
| -rw-r--r-- | include/standard-headers/linux/ethtool.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/standard-headers/linux/ethtool.h b/include/standard-headers/linux/ethtool.h index 1200890c86..fd8d2cccfe 100644 --- a/include/standard-headers/linux/ethtool.h +++ b/include/standard-headers/linux/ethtool.h @@ -1666,6 +1666,18 @@ static inline int ethtool_validate_duplex(uint8_t duplex) return 0; } +#define MASTER_SLAVE_CFG_UNSUPPORTED 0 +#define MASTER_SLAVE_CFG_UNKNOWN 1 +#define MASTER_SLAVE_CFG_MASTER_PREFERRED 2 +#define MASTER_SLAVE_CFG_SLAVE_PREFERRED 3 +#define MASTER_SLAVE_CFG_MASTER_FORCE 4 +#define MASTER_SLAVE_CFG_SLAVE_FORCE 5 +#define MASTER_SLAVE_STATE_UNSUPPORTED 0 +#define MASTER_SLAVE_STATE_UNKNOWN 1 +#define MASTER_SLAVE_STATE_MASTER 2 +#define MASTER_SLAVE_STATE_SLAVE 3 +#define MASTER_SLAVE_STATE_ERR 4 + /* Which connector port. */ #define PORT_TP 0x00 #define PORT_AUI 0x01 @@ -1904,7 +1916,9 @@ struct ethtool_link_settings { uint8_t eth_tp_mdix_ctrl; int8_t link_mode_masks_nwords; uint8_t transceiver; - uint8_t reserved1[3]; + uint8_t master_slave_cfg; + uint8_t master_slave_state; + uint8_t reserved1[1]; uint32_t reserved[7]; uint32_t link_mode_masks[0]; /* layout of link_mode_masks fields: |