Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ebb7f8d authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

qeth: Fix retry logic in hardsetup 



The previous code did never retry any idx setup unless retries were done
for device offline/online at the beginning of the function.

Signed-off-by: default avatarStefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9acefd17

drivers/s390/net/qeth_core_main.c

+3 −3
Original line number Diff line number Diff line
@@ -4765,14 +4765,14 @@ static struct ccw_driver qeth_ccw_driver = { 


int qeth_core_hardsetup_card(struct qeth_card *card)

{

	int retries = 0;

	int retries = 3;

	int rc;



	QETH_DBF_TEXT(SETUP, 2, "hrdsetup");

	atomic_set(&card->force_alloc_skb, 0);

	qeth_update_from_chp_desc(card);

retry:

	if (retries)

	if (retries < 3)

		QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",

			dev_name(&card->gdev->dev));

	ccw_device_set_offline(CARD_DDEV(card));
@@ -4794,7 +4794,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
		return rc;

	} else if (rc) {

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

		if (++retries > 3)

		if (--retries < 0)

			goto out;

		else

			goto retry;