diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-24 12:21:22 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-24 11:02:35 -0500 |
| commit | 3358a5c0c1578fa215f90a0e750579cd6258ddd9 (patch) | |
| tree | 5c6e34a1101d9ae83020cde8a279a59ff7cf94e0 /drivers | |
| parent | net: cdc_ncm: avoid changing RX/TX buffers on MTU changes (diff) | |
| download | linux-dev-3358a5c0c1578fa215f90a0e750579cd6258ddd9.tar.xz linux-dev-3358a5c0c1578fa215f90a0e750579cd6258ddd9.zip | |
qlcnic: fix a loop exit condition better
In the original code, if we succeeded on the last iteration through the
loop then we still returned failure.
Fixes: 389e4e04ad2d ('qlcnic: fix a timeout loop')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c index b1a452f291ee..34906750b7e7 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c @@ -252,7 +252,7 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter) state = QLCRDX(ahw, QLC_83XX_VNIC_STATE); } - if (!idc->vnic_wait_limit) { + if (state != QLCNIC_DEV_NPAR_OPER) { dev_err(&adapter->pdev->dev, "vNIC mode not operational, state check timed out.\n"); return -EIO; |