qede: Prevent index problems in loopback test

Orabug: 25477939

Driver currently utilizes the same loop variable in two
nested loops.

Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit afe981d664aeeebc8d1bcbd7d2070b5432edaecb)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 0591acb01c4389fcdb63795dd3eb4a5273016fd3..0e9b07b6aeddb6e2b0a310380a7746b613be0482 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -1239,7 +1239,7 @@ static int qede_selftest_receive_traffic(struct qede_dev *edev)
        struct qede_rx_queue *rxq = NULL;
        struct sw_rx_data *sw_rx_data;
        union eth_rx_cqe *cqe;
-       int i, rc = 0;
+       int i, iter, rc = 0;
        u8 *data_ptr;
 
        for_each_queue(i) {
@@ -1258,7 +1258,7 @@ static int qede_selftest_receive_traffic(struct qede_dev *edev)
         * enabled. This is because the queue 0 is configured as the default
         * queue and that the loopback traffic is not IP.
         */
-       for (i = 0; i < QEDE_SELFTEST_POLL_COUNT; i++) {
+       for (iter = 0; iter < QEDE_SELFTEST_POLL_COUNT; iter++) {
                if (!qede_has_rx_work(rxq)) {
                        usleep_range(100, 200);
                        continue;
@@ -1305,7 +1305,7 @@ static int qede_selftest_receive_traffic(struct qede_dev *edev)
                qed_chain_recycle_consumed(&rxq->rx_comp_ring);
        }
 
-       if (i == QEDE_SELFTEST_POLL_COUNT) {
+       if (iter == QEDE_SELFTEST_POLL_COUNT) {
                DP_NOTICE(edev, "Failed to receive the traffic\n");
                return -1;
        }