diff options
author | David Miller <davem@davemloft.net> | 2011-12-02 11:52:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-05 15:20:19 -0500 |
commit | 2721745501a26d0dc3b88c0d2f3aa11471891388 (patch) | |
tree | e9c09622b11ad7d9317b4b01824374a852867c28 /drivers/scsi | |
parent | 761965eab38d2cbc59c36e355c59609e3a04705a (diff) |
net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.
To reflect the fact that a refrence is not obtained to the
resulting neighbour entry.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 | ||||
-rw-r--r-- | drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 | ||||
-rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c index 000294a9df80..88902d380f88 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | |||
@@ -966,7 +966,7 @@ static int init_act_open(struct cxgbi_sock *csk) | |||
966 | csk->saddr.sin_addr.s_addr = chba->ipv4addr; | 966 | csk->saddr.sin_addr.s_addr = chba->ipv4addr; |
967 | 967 | ||
968 | csk->rss_qid = 0; | 968 | csk->rss_qid = 0; |
969 | csk->l2t = t3_l2t_get(t3dev, dst_get_neighbour(dst), ndev); | 969 | csk->l2t = t3_l2t_get(t3dev, dst_get_neighbour_noref(dst), ndev); |
970 | if (!csk->l2t) { | 970 | if (!csk->l2t) { |
971 | pr_err("NO l2t available.\n"); | 971 | pr_err("NO l2t available.\n"); |
972 | return -EINVAL; | 972 | return -EINVAL; |
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index ac7a9b1e3e23..c8fd13aadf9c 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | |||
@@ -1141,7 +1141,7 @@ static int init_act_open(struct cxgbi_sock *csk) | |||
1141 | cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); | 1141 | cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); |
1142 | cxgbi_sock_get(csk); | 1142 | cxgbi_sock_get(csk); |
1143 | 1143 | ||
1144 | csk->l2t = cxgb4_l2t_get(lldi->l2t, dst_get_neighbour(csk->dst), ndev, 0); | 1144 | csk->l2t = cxgb4_l2t_get(lldi->l2t, dst_get_neighbour_noref(csk->dst), ndev, 0); |
1145 | if (!csk->l2t) { | 1145 | if (!csk->l2t) { |
1146 | pr_err("%s, cannot alloc l2t.\n", ndev->name); | 1146 | pr_err("%s, cannot alloc l2t.\n", ndev->name); |
1147 | goto rel_resource; | 1147 | goto rel_resource; |
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index c10f74a566f2..a026a2f12621 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c | |||
@@ -493,7 +493,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) | |||
493 | goto err_out; | 493 | goto err_out; |
494 | } | 494 | } |
495 | dst = &rt->dst; | 495 | dst = &rt->dst; |
496 | ndev = dst_get_neighbour(dst)->dev; | 496 | ndev = dst_get_neighbour_noref(dst)->dev; |
497 | 497 | ||
498 | if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) { | 498 | if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) { |
499 | pr_info("multi-cast route %pI4, port %u, dev %s.\n", | 499 | pr_info("multi-cast route %pI4, port %u, dev %s.\n", |
@@ -507,7 +507,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) | |||
507 | ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); | 507 | ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); |
508 | mtu = ndev->mtu; | 508 | mtu = ndev->mtu; |
509 | pr_info("rt dev %s, loopback -> %s, mtu %u.\n", | 509 | pr_info("rt dev %s, loopback -> %s, mtu %u.\n", |
510 | dst_get_neighbour(dst)->dev->name, ndev->name, mtu); | 510 | dst_get_neighbour_noref(dst)->dev->name, ndev->name, mtu); |
511 | } | 511 | } |
512 | 512 | ||
513 | cdev = cxgbi_device_find_by_netdev(ndev, &port); | 513 | cdev = cxgbi_device_find_by_netdev(ndev, &port); |