History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

David S. Miller committed 9 years ago

Commit e2160152 parents 62e1309 6d04dfc105 files · +1186 −643Browse files

Showing the changes to include/uapi/linux (1 of 105 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
1384 ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,1384 ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
1385 ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,1385 ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
1386 ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,1386 ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
1387 ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1388 ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
1387 1389
1388 1390
1389 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit1391 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
@@ -1393,7 +1395,7 @@ enum ethtool_link_mode_bit_indices { · 3 unmodified lines
1393 */1395 */
1394 1396
1395 __ETHTOOL_LINK_MODE_LAST1397 __ETHTOOL_LINK_MODE_LAST
1396 = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,1398 = ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
1397};1399};
1398 1400
1399#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \1401#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \