rds: Changing IP address internal representation to struct in6_addr
This patch changes the internal representation of an IP address to use struct in6_addr. IPv4 address is stored as an IPv4 mapped address. All the functions which take an IP address as argument are also changed to use struct in6_addr. But RDS socket layer is not modified such that it still does not accept IPv6 address from an application. And RDS layer does not accept nor initiate IPv6 connections. v2: Fixed sparse warnings. Signed-off-by: Ka-Cheong Poon <ka-cheong.poon@oracle.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
a6c90dd321
commit
eee2fa6ab3
17
net/rds/ib.c
17
net/rds/ib.c
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2006 Oracle. All rights reserved.
|
||||
* Copyright (c) 2006, 2017 Oracle and/or its affiliates. All rights reserved.
|
||||
*
|
||||
* This software is available to you under a choice of one of two
|
||||
* licenses. You may choose to be licensed under the terms of the GNU
|
||||
@@ -296,8 +296,8 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
|
||||
if (conn->c_trans != &rds_ib_transport)
|
||||
return 0;
|
||||
|
||||
iinfo->src_addr = conn->c_laddr;
|
||||
iinfo->dst_addr = conn->c_faddr;
|
||||
iinfo->src_addr = conn->c_laddr.s6_addr32[3];
|
||||
iinfo->dst_addr = conn->c_faddr.s6_addr32[3];
|
||||
|
||||
memset(&iinfo->src_gid, 0, sizeof(iinfo->src_gid));
|
||||
memset(&iinfo->dst_gid, 0, sizeof(iinfo->dst_gid));
|
||||
@@ -341,7 +341,8 @@ static void rds_ib_ic_info(struct socket *sock, unsigned int len,
|
||||
* allowed to influence which paths have priority. We could call userspace
|
||||
* asserting this policy "routing".
|
||||
*/
|
||||
static int rds_ib_laddr_check(struct net *net, __be32 addr)
|
||||
static int rds_ib_laddr_check(struct net *net, const struct in6_addr *addr,
|
||||
__u32 scope_id)
|
||||
{
|
||||
int ret;
|
||||
struct rdma_cm_id *cm_id;
|
||||
@@ -357,7 +358,7 @@ static int rds_ib_laddr_check(struct net *net, __be32 addr)
|
||||
|
||||
memset(&sin, 0, sizeof(sin));
|
||||
sin.sin_family = AF_INET;
|
||||
sin.sin_addr.s_addr = addr;
|
||||
sin.sin_addr.s_addr = addr->s6_addr32[3];
|
||||
|
||||
/* rdma_bind_addr will only succeed for IB & iWARP devices */
|
||||
ret = rdma_bind_addr(cm_id, (struct sockaddr *)&sin);
|
||||
@@ -367,9 +368,9 @@ static int rds_ib_laddr_check(struct net *net, __be32 addr)
|
||||
cm_id->device->node_type != RDMA_NODE_IB_CA)
|
||||
ret = -EADDRNOTAVAIL;
|
||||
|
||||
rdsdebug("addr %pI4 ret %d node type %d\n",
|
||||
&addr, ret,
|
||||
cm_id->device ? cm_id->device->node_type : -1);
|
||||
rdsdebug("addr %pI6c ret %d node type %d\n",
|
||||
addr, ret,
|
||||
cm_id->device ? cm_id->device->node_type : -1);
|
||||
|
||||
rdma_destroy_id(cm_id);
|
||||
|
||||
|
Reference in New Issue
Block a user