summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2016-06-02 20:53:43 +0000
committergnn <gnn@FreeBSD.org>2016-06-02 20:53:43 +0000
commitada12d916d2fc4a725e9c2f0ec61f027ce65471a (patch)
tree6cfc65ed8bfca61c2d1a965a848a080412d99190
parenta0e8915ea8a75848836eebc93e7afd68c9ffff70 (diff)
downloadFreeBSD-src-ada12d916d2fc4a725e9c2f0ec61f027ce65471a.zip
FreeBSD-src-ada12d916d2fc4a725e9c2f0ec61f027ce65471a.tar.gz
Fix up the Infiniband code to handle the new arpresolve.
-rw-r--r--sys/ofed/drivers/infiniband/core/addr.c4
-rw-r--r--sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/ofed/drivers/infiniband/core/addr.c b/sys/ofed/drivers/infiniband/core/addr.c
index 577ccc0..7a680ca 100644
--- a/sys/ofed/drivers/infiniband/core/addr.c
+++ b/sys/ofed/drivers/infiniband/core/addr.c
@@ -395,13 +395,13 @@ mcast:
#ifdef INET
case AF_INET:
error = arpresolve(ifp, is_gw, NULL,
- is_gw ? rte->rt_gateway : dst_in, edst, NULL);
+ is_gw ? rte->rt_gateway : dst_in, edst, NULL, NULL);
break;
#endif
#ifdef INET6
case AF_INET6:
error = nd6_resolve(ifp, is_gw, NULL,
- is_gw ? rte->rt_gateway : dst_in, edst, NULL);
+ is_gw ? rte->rt_gateway : dst_in, edst, NULL, NULL);
break;
#endif
default:
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 5bef672..b2f5efe 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1296,7 +1296,7 @@ ipoib_output(struct ifnet *ifp, struct mbuf *m,
else if (m->m_flags & M_MCAST)
ip_ib_mc_map(((struct sockaddr_in *)dst)->sin_addr.s_addr, ifp->if_broadcastaddr, edst);
else
- error = arpresolve(ifp, is_gw, m, dst, edst, NULL);
+ error = arpresolve(ifp, is_gw, m, dst, edst, NULL, NULL);
if (error)
return (error == EWOULDBLOCK ? 0 : error);
type = htons(ETHERTYPE_IP);
@@ -1334,7 +1334,7 @@ ipoib_output(struct ifnet *ifp, struct mbuf *m,
else if (m->m_flags & M_MCAST)
ipv6_ib_mc_map(&((struct sockaddr_in6 *)dst)->sin6_addr, ifp->if_broadcastaddr, edst);
else
- error = nd6_resolve(ifp, is_gw, m, dst, edst, NULL);
+ error = nd6_resolve(ifp, is_gw, m, dst, edst, NULL, NULL);
if (error)
return error;
type = htons(ETHERTYPE_IPV6);
OpenPOWER on IntegriCloud