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 07/19] net: usnic: use __ethtool_get_ksettings
    Date
    From: David Decotigny <decot@googlers.com>

    Signed-off-by: David Decotigny <decot@googlers.com>
    ---
    drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
    index e082170..e0d12d4 100644
    --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
    +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
    @@ -324,12 +324,12 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
    struct ib_port_attr *props)
    {
    struct usnic_ib_dev *us_ibdev = to_usdev(ibdev);
    - struct ethtool_cmd cmd;
    + struct ethtool_ksettings cmd;

    usnic_dbg("\n");

    mutex_lock(&us_ibdev->usdev_lock);
    - __ethtool_get_settings(us_ibdev->netdev, &cmd);
    + __ethtool_get_ksettings(us_ibdev->netdev, &cmd);
    memset(props, 0, sizeof(*props));

    props->lid = 0;
    @@ -353,8 +353,8 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,
    props->pkey_tbl_len = 1;
    props->bad_pkey_cntr = 0;
    props->qkey_viol_cntr = 0;
    - eth_speed_to_ib_speed(cmd.speed, &props->active_speed,
    - &props->active_width);
    + eth_speed_to_ib_speed(cmd.parent.speed, &props->active_speed,
    + &props->active_width);
    props->max_mtu = IB_MTU_4096;
    props->active_mtu = iboe_get_mtu(us_ibdev->ufdev->mtu);
    /* Userspace will adjust for hdrs */
    --
    2.6.0.rc2.230.g3dd15c0


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