diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-09-20 15:52:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-21 15:20:40 -0700 |
| commit | 19cab8872692960535aa6d12e3a295ac51d1a648 (patch) | |
| tree | 516a7daded4877c0efea1d6926c9e2adc35876af /net | |
| parent | 4a7a3860caac1a8779e8c459d8abe21b111798d6 (diff) | |
| download | linux-19cab8872692960535aa6d12e3a295ac51d1a648.tar.gz linux-19cab8872692960535aa6d12e3a295ac51d1a648.tar.bz2 linux-19cab8872692960535aa6d12e3a295ac51d1a648.zip | |
net: ethtool: Add back transceiver type
Commit 3f1ac7a700d0 ("net: ethtool: add new ETHTOOL_xLINKSETTINGS API")
deprecated the ethtool_cmd::transceiver field, which was fine in
premise, except that the PHY library was actually using it to report the
type of transceiver: internal or external.
Use the first word of the reserved field to put this __u8 transceiver
field back in. It is made read-only, and we don't expect the
ETHTOOL_xLINKSETTINGS API to be doing anything with this anyway, so this
is mostly for the legacy path where we do:
ethtool_get_settings()
-> dev->ethtool_ops->get_link_ksettings()
-> convert_link_ksettings_to_legacy_settings()
to have no information loss compared to the legacy get_settings API.
Fixes: 3f1ac7a700d0 ("net: ethtool: add new ETHTOOL_xLINKSETTINGS API")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 6a582ae4c5d9..3228411ada0f 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -525,6 +525,8 @@ convert_link_ksettings_to_legacy_settings( = link_ksettings->base.eth_tp_mdix; legacy_settings->eth_tp_mdix_ctrl = link_ksettings->base.eth_tp_mdix_ctrl; + legacy_settings->transceiver + = link_ksettings->base.transceiver; return retval; } |