diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-27 04:10:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-27 04:10:47 -0400 |
| commit | 5502bef3e776dfb17627ae3297a5bff3d8a2ba44 (patch) | |
| tree | e0c22a7a2cf3caa02e2b9d6a73e688fe3db7e268 /include/uapi/linux | |
| parent | f1eecb7ea89ef3ee0b0aa6e818a82e91d5525c18 (diff) | |
| parent | 52244d960755936fa9c8ce54d583d0ed46f24fb6 (diff) | |
| download | cachepc-linux-5502bef3e776dfb17627ae3297a5bff3d8a2ba44.tar.gz cachepc-linux-5502bef3e776dfb17627ae3297a5bff3d8a2ba44.zip | |
Merge branch 'mlx5e-100G-extensions'
Saeed Mahameed says:
====================
Mellanox 100G mlx5e Ethernet extensions
This series includes multiple features extensions for mlx5 Ethernet netdevice driver.
Namely, TX Rate limiting, RX interrupt moderation, ethtool settings.
TX Rate limiting:
- ConnectX-4 rate limiting infrastructure
- Set max rate NDO support
RX interrupt moderation:
- CQE based coalescing option (controlled via priv flags)
- Adaptive RX coalescing
ethtool settings:
- priv flags callbacks
- Support new ksettings API
- Add 50G missing link mode
- Support auto negotiation on/off
Applied on top: 0e9390ebf1fe ("Merge branch 'mlxsw-next'")
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/ethtool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 5f030b46cff4..b8f38e84d93a 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1362,6 +1362,7 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT = 37, ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT = 38, ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT = 39, + ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT = 40, /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_* @@ -1370,7 +1371,7 @@ enum ethtool_link_mode_bit_indices { */ __ETHTOOL_LINK_MODE_LAST - = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT, + = ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT, }; #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \ |