lkml.org 
[lkml]   [2019]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 11/32] [PATCH] IB: directly cast the sockaddr union to aockaddr
    Date
    Like commit 641114d2af31 ("RDMA: Directly cast the sockaddr union to
    sockaddr") we need to quiet gcc 9 from warning about this crazy union.
    That commit did not fix all of the warnings in 4.19 and older kernels
    because the logic in roce_resolve_route_from_path() was rewritten
    between 4.19 and 5.2 when that change happened.

    Cc: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/infiniband/core/sa_query.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/infiniband/core/sa_query.c
    +++ b/drivers/infiniband/core/sa_query.c
    @@ -1109,7 +1109,6 @@ int ib_init_ah_from_path(struct ib_devic
    .net = rec->net ? rec->net :
    &init_net};
    union {
    - struct sockaddr _sockaddr;
    struct sockaddr_in _sockaddr_in;
    struct sockaddr_in6 _sockaddr_in6;
    } sgid_addr, dgid_addr;
    @@ -1117,12 +1116,13 @@ int ib_init_ah_from_path(struct ib_devic
    if (!device->get_netdev)
    return -EOPNOTSUPP;

    - rdma_gid2ip(&sgid_addr._sockaddr, &rec->sgid);
    - rdma_gid2ip(&dgid_addr._sockaddr, &rec->dgid);
    + rdma_gid2ip((struct sockaddr *)&sgid_addr, &rec->sgid);
    + rdma_gid2ip((struct sockaddr *)&dgid_addr, &rec->dgid);

    /* validate the route */
    - ret = rdma_resolve_ip_route(&sgid_addr._sockaddr,
    - &dgid_addr._sockaddr, &dev_addr);
    + ret = rdma_resolve_ip_route((struct sockaddr *)&sgid_addr,
    + (struct sockaddr *)&dgid_addr,
    + &dev_addr);
    if (ret)
    return ret;


    \
     
     \ /
      Last update: 2019-08-09 15:56    [W:4.340 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site