lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v9 04/16] tx4939: use __ethtool_get_ksettings
    Date
    From: David Decotigny <decot@googlers.com>

    Signed-off-by: David Decotigny <decot@googlers.com>
    ---
    arch/mips/txx9/generic/setup_tx4939.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
    index e3733cd..402ac2e 100644
    --- a/arch/mips/txx9/generic/setup_tx4939.c
    +++ b/arch/mips/txx9/generic/setup_tx4939.c
    @@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
    #if IS_ENABLED(CONFIG_TC35815)
    static u32 tx4939_get_eth_speed(struct net_device *dev)
    {
    - struct ethtool_cmd cmd;
    - if (__ethtool_get_settings(dev, &cmd))
    + struct ethtool_link_ksettings cmd;
    +
    + if (__ethtool_get_link_ksettings(dev, &cmd))
    return 100; /* default 100Mbps */

    - return ethtool_cmd_speed(&cmd);
    + return cmd.base.speed;
    }

    static int tx4939_netdev_event(struct notifier_block *this,
    --
    2.7.0.rc3.207.g0ac5344
    \
     
     \ /
      Last update: 2016-02-24 20:41    [W:6.361 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site