diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-02 10:57:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-02 10:57:24 +0100 |
| commit | 3357b0d3c7323d73806571192e9f633bb6ba3d54 (patch) | |
| tree | a92fb225bfdda901783ad662a1fea0baddfb81e1 /net/core/ethtool.c | |
| parent | 82c62fa0c49aa305104013cee4468772799bb391 (diff) | |
| parent | e27c310af5c05cf876d9cad006928076c27f54d4 (diff) | |
| download | linux-3357b0d3c7323d73806571192e9f633bb6ba3d54.tar.gz linux-3357b0d3c7323d73806571192e9f633bb6ba3d54.tar.xz | |
Merge branch 'x86/mpx/prep' into x86/asm
Pick up some of the MPX commits that modify the syscall entry code,
to have a common base and to reduce conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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, EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32); /* return false if legacy contained non-0 deprecated fields - * transceiver/maxtxpkt/maxrxpkt. rest of ksettings always updated + * maxtxpkt/maxrxpkt. rest of ksettings always updated */ static bool convert_legacy_settings_to_link_ksettings( @@ -451,8 +451,7 @@ convert_legacy_settings_to_link_ksettings( * deprecated legacy fields, and they should not use * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS */ - if (legacy_settings->transceiver || - legacy_settings->maxtxpkt || + if (legacy_settings->maxtxpkt || legacy_settings->maxrxpkt) retval = false; |