lkml.org 
[lkml]   [2015]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v4 16/19] net: core: use __ethtool_get_ksettings
    Date
    From: David Decotigny <decot@googlers.com>

    Signed-off-by: David Decotigny <decot@googlers.com>
    ---
    net/core/net-sysfs.c | 15 +++++++++------
    net/packet/af_packet.c | 11 +++++------
    2 files changed, 14 insertions(+), 12 deletions(-)

    diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
    index f88a62a..3dd4bb1 100644
    --- a/net/core/net-sysfs.c
    +++ b/net/core/net-sysfs.c
    @@ -199,9 +199,10 @@ static ssize_t speed_show(struct device *dev,
    return restart_syscall();

    if (netif_running(netdev)) {
    - struct ethtool_cmd cmd;
    - if (!__ethtool_get_settings(netdev, &cmd))
    - ret = sprintf(buf, fmt_dec, ethtool_cmd_speed(&cmd));
    + struct ethtool_ksettings cmd;
    +
    + if (!__ethtool_get_ksettings(netdev, &cmd))
    + ret = sprintf(buf, fmt_dec, cmd.parent.speed);
    }
    rtnl_unlock();
    return ret;
    @@ -218,10 +219,12 @@ static ssize_t duplex_show(struct device *dev,
    return restart_syscall();

    if (netif_running(netdev)) {
    - struct ethtool_cmd cmd;
    - if (!__ethtool_get_settings(netdev, &cmd)) {
    + struct ethtool_ksettings cmd;
    +
    + if (!__ethtool_get_ksettings(netdev, &cmd)) {
    const char *duplex;
    - switch (cmd.duplex) {
    +
    + switch (cmd.parent.duplex) {
    case DUPLEX_HALF:
    duplex = "half";
    break;
    diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
    index 992396a..626dae0 100644
    --- a/net/packet/af_packet.c
    +++ b/net/packet/af_packet.c
    @@ -557,9 +557,8 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
    {
    struct net_device *dev;
    unsigned int mbits = 0, msec = 0, div = 0, tmo = 0;
    - struct ethtool_cmd ecmd;
    + struct ethtool_ksettings ecmd;
    int err;
    - u32 speed;

    rtnl_lock();
    dev = __dev_get_by_index(sock_net(&po->sk), po->ifindex);
    @@ -567,19 +566,19 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
    rtnl_unlock();
    return DEFAULT_PRB_RETIRE_TOV;
    }
    - err = __ethtool_get_settings(dev, &ecmd);
    - speed = ethtool_cmd_speed(&ecmd);
    + err = __ethtool_get_ksettings(dev, &ecmd);
    rtnl_unlock();
    if (!err) {
    /*
    * If the link speed is so slow you don't really
    * need to worry about perf anyways
    */
    - if (speed < SPEED_1000 || speed == SPEED_UNKNOWN) {
    + if (ecmd.parent.speed < SPEED_1000 ||
    + ecmd.parent.speed == SPEED_UNKNOWN) {
    return DEFAULT_PRB_RETIRE_TOV;
    } else {
    msec = 1;
    - div = speed / 1000;
    + div = ecmd.parent.speed / 1000;
    }
    }

    --
    2.6.0.rc2.230.g3dd15c0


    \
     
     \ /
      Last update: 2015-12-09 19:41    [W:2.686 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site