Skip to content

Commit

Permalink
qeth: Fix retry logic in hardsetup
Browse files Browse the repository at this point in the history
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: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stefan Raspl authored and David S. Miller committed Jan 21, 2013
1 parent 9acefd1 commit 6ebb7f8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/s390/net/qeth_core_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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;
Expand Down

0 comments on commit 6ebb7f8

Please sign in to comment.