d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up the Infiniband code to handle the new arpresolve.

Browse Source
This commit is contained in:
gnn 2016-06-02 20:53:43 +00:00
parent a0e8915ea8
commit ada12d916d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/ofed/drivers/infiniband/core/addr.c
View File

@ -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:

4
sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@ -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);