diff options
author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 18:24:00 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 23:20:05 +0100 |
commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
tree | 983681311986070971d3756d9f8e75868aa7bb9a /include/uapi | |
parent | NFSD: Reserve adequate space for LOCKT operation (diff) | |
parent | nfsd: Revert "nfsd: special case truncates some more" (diff) | |
download | linux-60709c093ed39aadb0f09972ebbc96dc34eb372e.tar.xz linux-60709c093ed39aadb0f09972ebbc96dc34eb372e.zip |
nfsd: merge stable fix into main nfsd branch
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/ethtool.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index f0db7788f887..3dc91a46e8b8 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1384,6 +1384,8 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44, ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45, ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46, + ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47, + ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48, /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit @@ -1393,7 +1395,7 @@ enum ethtool_link_mode_bit_indices { */ __ETHTOOL_LINK_MODE_LAST - = ETHTOOL_LINK_MODE_10000baseER_Full_BIT, + = ETHTOOL_LINK_MODE_5000baseT_Full_BIT, }; #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \ |