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 13/16] net: bridge: use __ethtool_get_ksettings
    Date
    From: David Decotigny <decot@googlers.com>

    Signed-off-by: David Decotigny <decot@googlers.com>
    ---
    net/bridge/br_if.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
    index c367b3e..b37a1cc 100644
    --- a/net/bridge/br_if.c
    +++ b/net/bridge/br_if.c
    @@ -36,10 +36,10 @@
    */
    static int port_cost(struct net_device *dev)
    {
    - struct ethtool_cmd ecmd;
    + struct ethtool_link_ksettings ecmd;

    - if (!__ethtool_get_settings(dev, &ecmd)) {
    - switch (ethtool_cmd_speed(&ecmd)) {
    + if (!__ethtool_get_link_ksettings(dev, &ecmd)) {
    + switch (ecmd.base.speed) {
    case SPEED_10000:
    return 2;
    case SPEED_1000:
    --
    2.7.0.rc3.207.g0ac5344
    \
     
     \ /
      Last update: 2016-02-24 20:41    [W:3.751 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site