Author: gnn
Date: Thu Jun 2 20:53:43 2016
New Revision: 301229
URL: https://svnweb.freebsd.org/changeset/base/301229
Log:
Fix up the Infiniband code to handle the new arpresolve.
Modified:
head/sys/ofed/drivers/infiniband/core/addr.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
Modified: head/sys/ofed/drivers/infiniband/core/addr.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/addr.c Thu Jun 2 20:31:02
2016 (r301228)
+++ head/sys/ofed/drivers/infiniband/core/addr.c Thu Jun 2 20:53:43
2016 (r301229)
@@ -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:
Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Thu Jun 2
20:31:02 2016 (r301228)
+++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Thu Jun 2
20:53:43 2016 (r301229)
@@ -1296,7 +1296,7 @@ ipoib_output(struct ifnet *ifp, struct 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 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);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
