5 files changed, 28 insertions, 58 deletions

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 8aba0ba57de5..e0ef5fdc361e 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -183,20 +183,15 @@ static int addr4_resolve(struct sockaddr_in *src_in,
 {
         __be32 src_ip = src_in->sin_addr.s_addr;
         __be32 dst_ip = dst_in->sin_addr.s_addr;
-        struct flowi fl;
         struct rtable *rt;
         struct neighbour *neigh;
         int ret;
 
-        memset(&fl, 0, sizeof fl);
-        fl.nl_u.ip4_u.daddr = dst_ip;
-        fl.nl_u.ip4_u.saddr = src_ip;
-        fl.oif = addr->bound_dev_if;
-
-        ret = ip_route_output_key(&init_net, &rt, &fl);
-        if (ret)
+        rt = ip_route_output(&init_net, dst_ip, src_ip, 0, addr->bound_dev_if);
+        if (IS_ERR(rt)) {
+                ret = PTR_ERR(rt);
                 goto out;
-
+        }
         src_in->sin_family = AF_INET;
         src_in->sin_addr.s_addr = rt->rt_src;
 
@@ -236,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.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/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index d02dcc6e5963..3216bcad7e82 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -338,23 +338,11 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip,
                                  __be16 peer_port, u8 tos)
 {
         struct rtable *rt;
-        struct flowi fl = {
-                .oif = 0,
-                .nl_u = {
-                         .ip4_u = {
-                                   .daddr = peer_ip,
-                                   .saddr = local_ip,
-                                   .tos = tos}
-                         },
-                .proto = IPPROTO_TCP,
-                .uli_u = {
-                          .ports = {
-                                    .sport = local_port,
-                                    .dport = peer_port}
-                          }
-        };
-
-        if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+
+        rt = ip_route_output_ports(&init_net, NULL, peer_ip, local_ip,
+                                   peer_port, local_port, IPPROTO_TCP,
+                                   tos, 0);
+        if (IS_ERR(rt))
                 return NULL;
         return rt;
 }
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index b4d9e4caf3c9..9d8dcfab2b38 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -315,23 +315,11 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip,
                                  __be16 peer_port, u8 tos)
 {
         struct rtable *rt;
-        struct flowi fl = {
-                .oif = 0,
-                .nl_u = {
-                         .ip4_u = {
-                                   .daddr = peer_ip,
-                                   .saddr = local_ip,
-                                   .tos = tos}
-                         },
-                .proto = IPPROTO_TCP,
-                .uli_u = {
-                          .ports = {
-                                    .sport = local_port,
-                                    .dport = peer_port}
-                          }
-        };
-
-        if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+
+        rt = ip_route_output_ports(&init_net, NULL, peer_ip, local_ip,
+                                   peer_port, local_port, IPPROTO_TCP,
+                                   tos, 0);
+        if (IS_ERR(rt))
                 return NULL;
         return rt;
 }
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 3b4ec3238ceb..3d7f3664b67b 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -153,7 +153,8 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
                                 nesdev, nesdev->netdev[0]->name);
                 netdev = nesdev->netdev[0];
                 nesvnic = netdev_priv(netdev);
-                is_bonded = (netdev->master == event_netdev);
+                is_bonded = netif_is_bond_slave(netdev) &&
+                            (netdev->master == event_netdev);
                 if ((netdev == event_netdev) || is_bonded) {
                         if (nesvnic->rdma_enabled == 0) {
                                 nes_debug(NES_DBG_NETDEV, "Returning without processing event for %s since"
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 009ec814d517..ef3291551bc6 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1104,21 +1104,19 @@ static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,
 static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpindex)
 {
         struct rtable *rt;
-        struct flowi fl;
         struct neighbour *neigh;
         int rc = arpindex;
         struct net_device *netdev;
         struct nes_adapter *nesadapter = nesvnic->nesdev->nesadapter;
 
-        memset(&fl, 0, sizeof fl);
-        fl.nl_u.ip4_u.daddr = htonl(dst_ip);
-        if (ip_route_output_key(&init_net, &rt, &fl)) {
+        rt = ip_route_output(&init_net, htonl(dst_ip), 0, 0, 0);
+        if (IS_ERR(rt)) {
                 printk(KERN_ERR "%s: ip_route_output_key failed for 0x%08X\n",
                                 __func__, dst_ip);
                 return rc;
         }
 
-        if (nesvnic->netdev->master)
+        if (netif_is_bond_slave(netdev))
                 netdev = nesvnic->netdev->master;
         else
                 netdev = nesvnic->netdev;