mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 08:49:45 +00:00
rxe: Do not use 'struct sockaddr' in a uapi header
Linux has two 'linux/socket.h' files - and only the one in the kernel defines struct sockaddr - the user space one does not. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
parent
5229f87efc
commit
7061f28d8a
2 changed files with 6 additions and 3 deletions
|
@ -74,8 +74,9 @@ void rxe_av_fill_ip_info(struct rxe_av *av,
|
|||
struct ib_gid_attr *sgid_attr,
|
||||
union ib_gid *sgid)
|
||||
{
|
||||
rdma_gid2ip(&av->sgid_addr._sockaddr, sgid);
|
||||
rdma_gid2ip(&av->dgid_addr._sockaddr, &rdma_ah_read_grh(attr)->dgid);
|
||||
rdma_gid2ip((struct sockaddr *)&av->sgid_addr, sgid);
|
||||
rdma_gid2ip((struct sockaddr *)&av->dgid_addr,
|
||||
&rdma_ah_read_grh(attr)->dgid);
|
||||
av->network_type = ib_gid_to_network_type(sgid_attr->gid_type, sgid);
|
||||
}
|
||||
|
||||
|
|
|
@ -35,6 +35,9 @@
|
|||
#define RDMA_USER_RXE_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/socket.h>
|
||||
#include <linux/in.h>
|
||||
#include <linux/in6.h>
|
||||
|
||||
union rxe_gid {
|
||||
__u8 raw[16];
|
||||
|
@ -57,7 +60,6 @@ struct rxe_av {
|
|||
__u8 network_type;
|
||||
struct rxe_global_route grh;
|
||||
union {
|
||||
struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} sgid_addr, dgid_addr;
|
||||
|
|
Loading…
Reference in a new issue