diff options
Diffstat (limited to 'drivers/scsi/cxgbi')
-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 ffb9eea7e4b9..bd22041e2789 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | |||
@@ -985,7 +985,7 @@ static int init_act_open(struct cxgbi_sock *csk) | |||
985 | csk->saddr.sin_addr.s_addr = chba->ipv4addr; | 985 | csk->saddr.sin_addr.s_addr = chba->ipv4addr; |
986 | 986 | ||
987 | csk->rss_qid = 0; | 987 | csk->rss_qid = 0; |
988 | csk->l2t = t3_l2t_get(t3dev, dst->neighbour, ndev); | 988 | csk->l2t = t3_l2t_get(t3dev, dst_get_neighbour(dst), ndev); |
989 | if (!csk->l2t) { | 989 | if (!csk->l2t) { |
990 | pr_err("NO l2t available.\n"); | 990 | pr_err("NO l2t available.\n"); |
991 | return -EINVAL; | 991 | return -EINVAL; |
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index f3a4cd7cf782..ae13c4993aa3 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | |||
@@ -1160,7 +1160,7 @@ static int init_act_open(struct cxgbi_sock *csk) | |||
1160 | cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); | 1160 | cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); |
1161 | cxgbi_sock_get(csk); | 1161 | cxgbi_sock_get(csk); |
1162 | 1162 | ||
1163 | csk->l2t = cxgb4_l2t_get(lldi->l2t, csk->dst->neighbour, ndev, 0); | 1163 | csk->l2t = cxgb4_l2t_get(lldi->l2t, dst_get_neighbour(csk->dst), ndev, 0); |
1164 | if (!csk->l2t) { | 1164 | if (!csk->l2t) { |
1165 | pr_err("%s, cannot alloc l2t.\n", ndev->name); | 1165 | pr_err("%s, cannot alloc l2t.\n", ndev->name); |
1166 | goto rel_resource; | 1166 | goto rel_resource; |
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index a2a9c7c6c643..77ac217ad5ce 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c | |||
@@ -492,7 +492,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) | |||
492 | goto err_out; | 492 | goto err_out; |
493 | } | 493 | } |
494 | dst = &rt->dst; | 494 | dst = &rt->dst; |
495 | ndev = dst->neighbour->dev; | 495 | ndev = dst_get_neighbour(dst)->dev; |
496 | 496 | ||
497 | if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) { | 497 | if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) { |
498 | pr_info("multi-cast route %pI4, port %u, dev %s.\n", | 498 | pr_info("multi-cast route %pI4, port %u, dev %s.\n", |
@@ -506,7 +506,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr) | |||
506 | ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); | 506 | ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr); |
507 | mtu = ndev->mtu; | 507 | mtu = ndev->mtu; |
508 | pr_info("rt dev %s, loopback -> %s, mtu %u.\n", | 508 | pr_info("rt dev %s, loopback -> %s, mtu %u.\n", |
509 | dst->neighbour->dev->name, ndev->name, mtu); | 509 | dst_get_neighbour(dst)->dev->name, ndev->name, mtu); |
510 | } | 510 | } |
511 | 511 | ||
512 | cdev = cxgbi_device_find_by_netdev(ndev, &port); | 512 | cdev = cxgbi_device_find_by_netdev(ndev, &port); |