2 files changed, 15 insertions, 15 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,
                          struct sockaddr_in6 *dst_in,
                          struct rdma_dev_addr *addr)
 {
-        struct flowi fl;
+        struct flowi6 fl6;
         struct neighbour *neigh;
         struct dst_entry *dst;
         int ret;
 
-        memset(&fl, 0, sizeof fl);
-        ipv6_addr_copy(&fl.fl6_dst, &dst_in->sin6_addr);
-        ipv6_addr_copy(&fl.fl6_src, &src_in->sin6_addr);
-        fl.flowi_oif = addr->bound_dev_if;
+        memset(&fl6, 0, sizeof fl6);
+        ipv6_addr_copy(&fl6.daddr, &dst_in->sin6_addr);
+        ipv6_addr_copy(&fl6.saddr, &src_in->sin6_addr);
+        fl6.flowi6_oif = addr->bound_dev_if;
 
-        dst = ip6_route_output(&init_net, NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl6);
         if ((ret = dst->error))
                 goto put;
 
-        if (ipv6_addr_any(&fl.fl6_src)) {
+        if (ipv6_addr_any(&fl6.saddr)) {
                 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
-                                         &fl.fl6_dst, 0, &fl.fl6_src);
+                                         &fl6.daddr, 0, &fl6.saddr);
                 if (ret)
                         goto put;
 
                 src_in->sin6_family = AF_INET6;
-                ipv6_addr_copy(&src_in->sin6_addr, &fl.fl6_src);
+                ipv6_addr_copy(&src_in->sin6_addr, &fl6.saddr);
         }
 
         if (dst->dev->flags & IFF_LOOPBACK) {
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index c8922f69705e..8cca60e43444 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3424,14 +3424,14 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
                              struct dst_entry **dst)
 {
 #if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE))
-        struct flowi fl;
+        struct flowi6 fl6;
 
-        memset(&fl, 0, sizeof(fl));
-        ipv6_addr_copy(&fl.fl6_dst, &dst_addr->sin6_addr);
-        if (ipv6_addr_type(&fl.fl6_dst) & IPV6_ADDR_LINKLOCAL)
-                fl.flowi_oif = dst_addr->sin6_scope_id;
+        memset(&fl6, 0, sizeof(fl6));
+        ipv6_addr_copy(&fl6.daddr, &dst_addr->sin6_addr);
+        if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)
+                fl6.flowi6_oif = dst_addr->sin6_scope_id;
 
-        *dst = ip6_route_output(&init_net, NULL, &fl);
+        *dst = ip6_route_output(&init_net, NULL, &fl6);
         if (*dst)
                 return 0;
 #endif