android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgbi: Convert over to dst_neigh_lookup().

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-07-02 22:08:58 -07:00
parent 24db1ba866
commit 0b399d46b3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/cxgbi/libcxgbi.c
View File

@ -494,7 +494,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
goto err_out; goto err_out;
} }
dst = &rt->dst; dst = &rt->dst;
n = dst_get_neighbour_noref(dst); n = dst_neigh_lookup(dst, &daddr->sin_addr.s_addr);
if (!n) { if (!n) {
err = -ENODEV; err = -ENODEV;
goto rel_rt; goto rel_rt;
@ -506,7 +506,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
&daddr->sin_addr.s_addr, ntohs(daddr->sin_port), &daddr->sin_addr.s_addr, ntohs(daddr->sin_port),
ndev->name); ndev->name);
err = -ENETUNREACH; err = -ENETUNREACH;
goto rel_rt; goto rel_neigh;
} }
if (ndev->flags & IFF_LOOPBACK) { if (ndev->flags & IFF_LOOPBACK) {
@ -521,7 +521,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
pr_info("dst %pI4, %s, NOT cxgbi device.\n", pr_info("dst %pI4, %s, NOT cxgbi device.\n",
&daddr->sin_addr.s_addr, ndev->name); &daddr->sin_addr.s_addr, ndev->name);
err = -ENETUNREACH; err = -ENETUNREACH;
goto rel_rt; goto rel_neigh;
} }
log_debug(1 << CXGBI_DBG_SOCK, log_debug(1 << CXGBI_DBG_SOCK,
"route to %pI4 :%u, ndev p#%d,%s, cdev 0x%p.\n", "route to %pI4 :%u, ndev p#%d,%s, cdev 0x%p.\n",
@ -531,7 +531,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
csk = cxgbi_sock_create(cdev); csk = cxgbi_sock_create(cdev);
if (!csk) { if (!csk) {
err = -ENOMEM; err = -ENOMEM;
goto rel_rt; goto rel_neigh;
} }
csk->cdev = cdev; csk->cdev = cdev;
csk->port_id = port; csk->port_id = port;
@ -541,9 +541,13 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
csk->daddr.sin_port = daddr->sin_port; csk->daddr.sin_port = daddr->sin_port;
csk->daddr.sin_family = daddr->sin_family; csk->daddr.sin_family = daddr->sin_family;
csk->saddr.sin_addr.s_addr = fl4.saddr; csk->saddr.sin_addr.s_addr = fl4.saddr;
neigh_release(n);
return csk; return csk;
rel_neigh:
neigh_release(n);
rel_rt: rel_rt:
ip_rt_put(rt); ip_rt_put(rt);
if (csk) if (csk)