On Fri, May 31, 2019 at 03:57:47PM +0200, Andrew Lunn wrote:
> Sync ethtool-copy.h with linux-next from 22/05/2019. This provides
> access to the new link modes for 100BaseT1 and 1000BaseT1.
>
> Signed-off-by: Andrew Lunn <and...@lunn.ch>
> ---
Reviewed-by: Michal Kubecek <mkube...@suse.cz>
BtW, this differs from the file "make headers_install" produces in
net-next but only in white space so that it doesn't really matter and it
gets sorted in a future sync.
> ethtool-copy.h | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/ethtool-copy.h b/ethtool-copy.h
> index 92ab10d65fc9..ad16e8f9c290 100644
> --- a/ethtool-copy.h
> +++ b/ethtool-copy.h
> @@ -1481,6 +1481,8 @@ enum ethtool_link_mode_bit_indices {
> ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
> ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65,
> ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66,
> + ETHTOOL_LINK_MODE_100baseT1_Full_BIT = 67,
> + ETHTOOL_LINK_MODE_1000baseT1_Full_BIT = 68,
>
> /* must be last entry */
> __ETHTOOL_LINK_MODE_MASK_NBITS
> @@ -1597,7 +1599,7 @@ enum ethtool_link_mode_bit_indices {
>
> static __inline__ int ethtool_validate_speed(__u32 speed)
> {
> - return speed <= INT_MAX || speed == SPEED_UNKNOWN;
> + return speed <= INT_MAX || speed == (__u32)SPEED_UNKNOWN;
> }
>
> /* Duplex, half or full. */
> @@ -1710,6 +1712,9 @@ static __inline__ int ethtool_validate_duplex(__u8
> duplex)
> #define ETH_MODULE_SFF_8436 0x4
> #define ETH_MODULE_SFF_8436_LEN 256
>
> +#define ETH_MODULE_SFF_8636_MAX_LEN 640
> +#define ETH_MODULE_SFF_8436_MAX_LEN 640
> +
> /* Reset flags */
> /* The reset() operation must clear the flags for the components which
> * were actually reset. On successful return, the flags indicate the
> --
> 2.20.1
>
