projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'omap1-upstream' and 'omap2-upstream' into devel
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
infiniband
/
core
/
addr.c
diff --git
a/drivers/infiniband/core/addr.c
b/drivers/infiniband/core/addr.c
index a91001c59b69d66a57770457c2c464ea0c5d14ff..5381c80de10aad692290898003c7ebf543274191 100644
(file)
--- a/
drivers/infiniband/core/addr.c
+++ b/
drivers/infiniband/core/addr.c
@@
-161,8
+161,7
@@
static void addr_send_arp(struct sockaddr_in *dst_in)
if (ip_route_output_key(&rt, &fl))
return;
if (ip_route_output_key(&rt, &fl))
return;
- arp_send(ARPOP_REQUEST, ETH_P_ARP, rt->rt_gateway, rt->idev->dev,
- rt->rt_src, NULL, rt->idev->dev->dev_addr, NULL);
+ neigh_event_send(rt->u.dst.neighbour, NULL);
ip_rt_put(rt);
}
ip_rt_put(rt);
}
@@
-295,10
+294,9
@@
int rdma_resolve_ip(struct rdma_addr_client *client,
struct addr_req *req;
int ret = 0;
struct addr_req *req;
int ret = 0;
- req = k
m
alloc(sizeof *req, GFP_KERNEL);
+ req = k
z
alloc(sizeof *req, GFP_KERNEL);
if (!req)
return -ENOMEM;
if (!req)
return -ENOMEM;
- memset(req, 0, sizeof *req);
if (src_addr)
memcpy(&req->src_addr, src_addr, ip_addr_size(src_addr));
if (src_addr)
memcpy(&req->src_addr, src_addr, ip_addr_size(src_addr));