Fix up the Infiniband code to handle the new arpresolve.
This commit is contained in:
parent
d82362bbce
commit
fd9e88e0f9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=301229
@ -395,13 +395,13 @@ static int addr_resolve(struct sockaddr *src_in,
|
||||
#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:
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user