diff options
| author | Varun Prakash <varun@chelsio.com> | 2019-04-14 20:23:31 +0530 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-15 22:14:20 -0400 |
| commit | 74dea0bed79353ce2aadcb06406d3a9d28bae57b (patch) | |
| tree | 37e4e15c01c9324d10c829dd2081156d7be6d709 /drivers/scsi/cxgbi/libcxgbi.c | |
| parent | ffcd686b913eab35b7f447d8e373aae16d5fed34 (diff) | |
| download | linux-74dea0bed79353ce2aadcb06406d3a9d28bae57b.tar.gz linux-74dea0bed79353ce2aadcb06406d3a9d28bae57b.tar.bz2 linux-74dea0bed79353ce2aadcb06406d3a9d28bae57b.zip | |
scsi: libcxgbi: update route finding logic
To support vlan and bridge devices first find route using ifindex 0, if
route is not found through net device associated with input scsi host then
find route using ifindex of net device.
Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/cxgbi/libcxgbi.c')
| -rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index d7abc7e9ec94..8b915d4ed98d 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -2562,13 +2562,9 @@ struct iscsi_endpoint *cxgbi_ep_connect(struct Scsi_Host *shost, pr_info("shost 0x%p, priv NULL.\n", shost); goto err_out; } - - rtnl_lock(); - if (!vlan_uses_dev(hba->ndev)) - ifindex = hba->ndev->ifindex; - rtnl_unlock(); } +check_route: if (dst_addr->sa_family == AF_INET) { csk = cxgbi_check_route(dst_addr, ifindex); #if IS_ENABLED(CONFIG_IPV6) @@ -2589,6 +2585,13 @@ struct iscsi_endpoint *cxgbi_ep_connect(struct Scsi_Host *shost, if (!hba) hba = csk->cdev->hbas[csk->port_id]; else if (hba != csk->cdev->hbas[csk->port_id]) { + if (ifindex != hba->ndev->ifindex) { + cxgbi_sock_put(csk); + cxgbi_sock_closed(csk); + ifindex = hba->ndev->ifindex; + goto check_route; + } + pr_info("Could not connect through requested host %u" "hba 0x%p != 0x%p (%u).\n", shost->host_no, hba, |