3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index fc2cdb62f53b..abc7b122e050 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)
                 csk->saddr.sin_addr.s_addr = chba->ipv4addr;
 
         csk->rss_qid = 0;
-        csk->l2t = t3_l2t_get(t3dev, dst->neighbour, ndev);
+        csk->l2t = t3_l2t_get(t3dev, dst_get_neighbour(dst), ndev);
         if (!csk->l2t) {
                 pr_err("NO l2t available.\n");
                 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)
         cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
         cxgbi_sock_get(csk);
 
-        csk->l2t = cxgb4_l2t_get(lldi->l2t, csk->dst->neighbour, ndev, 0);
+        csk->l2t = cxgb4_l2t_get(lldi->l2t, dst_get_neighbour(csk->dst), ndev, 0);
         if (!csk->l2t) {
                 pr_err("%s, cannot alloc l2t.\n", ndev->name);
                 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)
                 goto err_out;
         }
         dst = &rt->dst;
-        ndev = dst->neighbour->dev;
+        ndev = dst_get_neighbour(dst)->dev;
 
         if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) {
                 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)
                 ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr);
                 mtu = ndev->mtu;
                 pr_info("rt dev %s, loopback -> %s, mtu %u.\n",
-                        dst->neighbour->dev->name, ndev->name, mtu);
+                        dst_get_neighbour(dst)->dev->name, ndev->name, mtu);
         }
 
         cdev = cxgbi_device_find_by_netdev(ndev, &port);