luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/core: change rdma_gid2ip into void function as it always return zero

Browse Source 
Signed-off-by: Honggang Li <honli@redhat.com>
Acked-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Honggang LI 2015-04-29 17:40:44 +08:00 committed by Doug Ledford
parent d4988623cc
commit 471e705832
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/infiniband/core/addr.c
View File

@ -472,13 +472,8 @@ int rdma_addr_find_dmac_by_grh(union ib_gid *sgid, union ib_gid *dgid, u8 *dmac,
} sgid_addr, dgid_addr; } sgid_addr, dgid_addr;
ret = rdma_gid2ip(&sgid_addr._sockaddr, sgid); rdma_gid2ip(&sgid_addr._sockaddr, sgid);
if (ret) rdma_gid2ip(&dgid_addr._sockaddr, dgid);
return ret;
ret = rdma_gid2ip(&dgid_addr._sockaddr, dgid);
if (ret)
return ret;
memset(&dev_addr, 0, sizeof(dev_addr)); memset(&dev_addr, 0, sizeof(dev_addr));
@ -512,10 +507,8 @@ int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
struct sockaddr_in6 _sockaddr_in6; struct sockaddr_in6 _sockaddr_in6;
} gid_addr; } gid_addr;
ret = rdma_gid2ip(&gid_addr._sockaddr, sgid); rdma_gid2ip(&gid_addr._sockaddr, sgid);
if (ret)
return ret;
memset(&dev_addr, 0, sizeof(dev_addr)); memset(&dev_addr, 0, sizeof(dev_addr));
ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id); ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
if (ret) if (ret)

3
include/rdma/ib_addr.h
View File

@ -160,7 +160,7 @@ static inline int rdma_ip2gid(struct sockaddr *addr, union ib_gid *gid)
} }
/* Important - sockaddr should be a union of sockaddr_in and sockaddr_in6 */ /* Important - sockaddr should be a union of sockaddr_in and sockaddr_in6 */
static inline int rdma_gid2ip(struct sockaddr *out, union ib_gid *gid) static inline void rdma_gid2ip(struct sockaddr *out, union ib_gid *gid)
{ {
if (ipv6_addr_v4mapped((struct in6_addr *)gid)) { if (ipv6_addr_v4mapped((struct in6_addr *)gid)) {
struct sockaddr_in *out_in = (struct sockaddr_in *)out; struct sockaddr_in *out_in = (struct sockaddr_in *)out;
@ -173,7 +173,6 @@ static inline int rdma_gid2ip(struct sockaddr *out, union ib_gid *gid)
out_in->sin6_family = AF_INET6; out_in->sin6_family = AF_INET6;
memcpy(&out_in->sin6_addr.s6_addr, gid->raw, 16); memcpy(&out_in->sin6_addr.s6_addr, gid->raw, 16);
} }
return 0;
} }
static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr, static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr,