diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
| commit | d28996d022a87e81bd6d4bedd5990b68d7e4d567 (patch) | |
| tree | 8b7a18ca2701b77a626a0e3c155d5e63a7fa99a6 /include/rdma/ib_addr.h | |
| parent | ec54c473486f2addc56e99c1191e4975123930d7 (diff) | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-17.02-rt
Diffstat (limited to 'include/rdma/ib_addr.h')
| -rw-r--r-- | include/rdma/ib_addr.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index ce55906b54a0..2ecac2032a3a 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -184,10 +184,12 @@ static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr, dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if); if (dev) { - ip4 = (struct in_device *)dev->ip_ptr; - if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) + ip4 = in_dev_get(dev); + if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) { ipv6_addr_set_v4mapped(ip4->ifa_list->ifa_address, (struct in6_addr *)gid); + in_dev_put(ip4); + } dev_put(dev); } } |