diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-04 21:33:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-04 21:33:03 -0700 |
| commit | 36302685f59345959de96d0d70a5ad20a3a3451b (patch) | |
| tree | 778b3170acd1131840823520a4664f2bba343dbe /net/rds | |
| parent | 2fc4aa59ab470f1d5124b33c05680e2b2f2c6f65 (diff) | |
| parent | 28619527b8a712590c93d0a9e24b4425b9376a8c (diff) | |
| download | linux-36302685f59345959de96d0d70a5ad20a3a3451b.tar.gz linux-36302685f59345959de96d0d70a5ad20a3a3451b.tar.bz2 linux-36302685f59345959de96d0d70a5ad20a3a3451b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/Kconfig | 2 | ||||
| -rw-r--r-- | net/rds/ib.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/net/rds/Kconfig b/net/rds/Kconfig index 01b3bd6a3708..b9092111bc45 100644 --- a/net/rds/Kconfig +++ b/net/rds/Kconfig @@ -1,6 +1,6 @@ config RDS - tristate "The RDS Protocol" + tristate "The Reliable Datagram Sockets Protocol" depends on INET ---help--- The RDS (Reliable Datagram Sockets) protocol provides reliable, diff --git a/net/rds/ib.c b/net/rds/ib.c index c1d97640c0be..eba75c1ba359 100644 --- a/net/rds/ib.c +++ b/net/rds/ib.c @@ -341,15 +341,10 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn, if (rds_conn_state(conn) == RDS_CONN_UP) { struct rds_ib_device *rds_ibdev; - struct rdma_dev_addr *dev_addr; ic = conn->c_transport_data; - dev_addr = &ic->i_cm_id->route.addr.dev_addr; - rdma_addr_get_sgid(dev_addr, - (union ib_gid *)&iinfo6->src_gid); - rdma_addr_get_dgid(dev_addr, - (union ib_gid *)&iinfo6->dst_gid); - + rdma_read_gids(ic->i_cm_id, (union ib_gid *)&iinfo6->src_gid, + (union ib_gid *)&iinfo6->dst_gid); rds_ibdev = ic->rds_ibdev; iinfo6->max_send_wr = ic->i_send_ring.w_nr; iinfo6->max_recv_wr = ic->i_recv_ring.w_nr; |