diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
commit | 9b09342f5cfa5b4b3447de17de284111bfdeab26 (patch) | |
tree | c71fcb17aecf0f77fb8e24f48feb07482f3cff77 /net/core/ethtool.c | |
parent | b9e43e363d0115ca981c106d968e24140ad37f6c (diff) | |
parent | 0224d45c9d46401b6d7018a96cfe049c5da7d91c (diff) | |
download | linux-9b09342f5cfa5b4b3447de17de284111bfdeab26.tar.xz |
Merge branch 'i2c/cht-wc-fusb302-immutable' into i2c/for-4.15
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; |