aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 16:22:43 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 18:08:54 -0500
commit4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (patch)
treec29c8070012cffb38fe249cf528589a675f622b1 /drivers/infiniband/core
parent9cce96df5b76691712dba22e83ff5efe900361e1 (diff)
ipv6: Convert to use flowi6 where applicable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/core')
-rw-r--r--drivers/infiniband/core/addr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 3c2b309ab891..e0ef5fdc361e 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -231,28 +231,28 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
231 struct sockaddr_in6 *dst_in, 231 struct sockaddr_in6 *dst_in,
232 struct rdma_dev_addr *addr) 232 struct rdma_dev_addr *addr)
233{ 233{
234 struct flowi fl; 234 struct flowi6 fl6;
235 struct neighbour *neigh; 235 struct neighbour *neigh;
236 struct dst_entry *dst; 236 struct dst_entry *dst;
237 int ret; 237 int ret;
238 238
239 memset(&fl, 0, sizeof fl); 239 memset(&fl6, 0, sizeof fl6);
240 ipv6_addr_copy(&fl.fl6_dst, &dst_in->sin6_addr); 240 ipv6_addr_copy(&fl6.daddr, &dst_in->sin6_addr);
241 ipv6_addr_copy(&fl.fl6_src, &src_in->sin6_addr); 241 ipv6_addr_copy(&fl6.saddr, &src_in->sin6_addr);
242 fl.flowi_oif = addr->bound_dev_if; 242 fl6.flowi6_oif = addr->bound_dev_if;
243 243
244 dst = ip6_route_output(&init_net, NULL, &fl); 244 dst = ip6_route_output(&init_net, NULL, &fl6);
245 if ((ret = dst->error)) 245 if ((ret = dst->error))
246 goto put; 246 goto put;
247 247
248 if (ipv6_addr_any(&fl.fl6_src)) { 248 if (ipv6_addr_any(&fl6.saddr)) {
249 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, 249 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
250 &fl.fl6_dst, 0, &fl.fl6_src); 250 &fl6.daddr, 0, &fl6.saddr);
251 if (ret) 251 if (ret)
252 goto put; 252 goto put;
253 253
254 src_in->sin6_family = AF_INET6; 254 src_in->sin6_family = AF_INET6;
255 ipv6_addr_copy(&src_in->sin6_addr, &fl.fl6_src); 255 ipv6_addr_copy(&src_in->sin6_addr, &fl6.saddr);
256 } 256 }
257 257
258 if (dst->dev->flags & IFF_LOOPBACK) { 258 if (dst->dev->flags & IFF_LOOPBACK) {