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 0c406306792a..f8fcf450a36e 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -452,7 +452,7 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, | |||
452 | EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32); | 452 | EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32); |
453 | 453 | ||
454 | /* return false if legacy contained non-0 deprecated fields | 454 | /* return false if legacy contained non-0 deprecated fields |
455 | * transceiver/maxtxpkt/maxrxpkt. rest of ksettings always updated | 455 | * maxtxpkt/maxrxpkt. rest of ksettings always updated |
456 | */ | 456 | */ |
457 | static bool | 457 | static bool |
458 | convert_legacy_settings_to_link_ksettings( | 458 | convert_legacy_settings_to_link_ksettings( |
@@ -467,8 +467,7 @@ convert_legacy_settings_to_link_ksettings( | |||
467 | * deprecated legacy fields, and they should not use | 467 | * deprecated legacy fields, and they should not use |
468 | * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS | 468 | * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS |
469 | */ | 469 | */ |
470 | if (legacy_settings->transceiver || | 470 | if (legacy_settings->maxtxpkt || |
471 | legacy_settings->maxtxpkt || | ||
472 | legacy_settings->maxrxpkt) | 471 | legacy_settings->maxrxpkt) |
473 | retval = false; | 472 | retval = false; |
474 | 473 | ||