Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / include / uapi / linux / ethtool.h

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index b8f38e84d93a79a0bb91a6b4659b4a62d7cc0b1b..099a4200732cc187f069331cbf3cbfa35e9a7e52 100644 (file)
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1362,7 +1362,14 @@ 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,
+       ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT         = 40,
+       ETHTOOL_LINK_MODE_1000baseX_Full_BIT    = 41,
+       ETHTOOL_LINK_MODE_10000baseCR_Full_BIT  = 42,
+       ETHTOOL_LINK_MODE_10000baseSR_Full_BIT  = 43,
+       ETHTOOL_LINK_MODE_10000baseLR_Full_BIT  = 44,
+       ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
+       ETHTOOL_LINK_MODE_10000baseER_Full_BIT  = 46,
+
 
        /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
         * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1371,7 +1378,7 @@ enum ethtool_link_mode_bit_indices {
         */
 
        __ETHTOOL_LINK_MODE_LAST
-         = ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,
+         = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
 };
 
 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)     \