diff options
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r-- | net/core/ethtool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 3228411ada0f..9a9a3d77e327 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -436,7 +436,7 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, | |||
436 | EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32); | 436 | EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32); |
437 | 437 | ||
438 | /* return false if legacy contained non-0 deprecated fields | 438 | /* return false if legacy contained non-0 deprecated fields |
439 | * transceiver/maxtxpkt/maxrxpkt. rest of ksettings always updated | 439 | * maxtxpkt/maxrxpkt. rest of ksettings always updated |
440 | */ | 440 | */ |
441 | static bool | 441 | static bool |
442 | convert_legacy_settings_to_link_ksettings( | 442 | convert_legacy_settings_to_link_ksettings( |
@@ -451,8 +451,7 @@ convert_legacy_settings_to_link_ksettings( | |||
451 | * deprecated legacy fields, and they should not use | 451 | * deprecated legacy fields, and they should not use |
452 | * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS | 452 | * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS |
453 | */ | 453 | */ |
454 | if (legacy_settings->transceiver || | 454 | if (legacy_settings->maxtxpkt || |
455 | legacy_settings->maxtxpkt || | ||
456 | legacy_settings->maxrxpkt) | 455 | legacy_settings->maxrxpkt) |
457 | retval = false; | 456 | retval = false; |
458 | 457 | ||