History

nfsd: merge stable fix into main nfsd branch

J. Bruce Fields committed 9 years ago

Commit 60709c02 parents 7323f0d 0839ffb183 files · +1692 −1239Browse files

Showing the changes to include/uapi/linux (1 of 183 files). Show all

Unified · Split

include/uapi/linux/ethtool.h+3−1
@@ -1384,6 +1384,8 @@ enum ethtool_link_mode_bit_indices { · 1383 unmodified lines
13841384 ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
13851385 ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
13861386 ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
1387+ ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1388+ ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
13871389
13881390
13891391 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
@@ -1393,7 +1395,7 @@ enum ethtool_link_mode_bit_indices { · 3 unmodified lines
13931395 */
13941396
13951397 __ETHTOOL_LINK_MODE_LAST
1396− = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
1398+ = ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
13971399 };
13981400
13991401 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \