From: Frank Pavlic <fpavlic@de.ibm.com>
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org
Subject: [PATCH 2/8] s390: qeth driver does not recover
Date: Wed, 20 Jun 2007 12:56:49 +0200 [thread overview]
Message-ID: <20070620105649.GB9454@de.ibm.com> (raw)
In-Reply-To: <20070620104817.GA2627@de.ibm.com>
From: Ursula Braun <braunu@de.ibm.com>
While first recovery continues, the card issues
a STARTLAN command itself. In this case qeth
schedules another recovery. This second
recovery is cancelled because of an already running first recovery.
Stop first recovery in case of 0xe080.
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
---
drivers/s390/net/qeth_main.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index ea2fd98..c5a9507 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -986,15 +986,15 @@ qeth_recover(void *ptr)
card->use_hard_stop = 1;
__qeth_set_offline(card->gdev,1);
rc = __qeth_set_online(card->gdev,1);
+ /* don't run another scheduled recovery */
+ qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
+ qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
if (!rc)
PRINT_INFO("Device %s successfully recovered!\n",
CARD_BUS_ID(card));
else
PRINT_INFO("Device %s could not be recovered!\n",
CARD_BUS_ID(card));
- /* don't run another scheduled recovery */
- qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
- qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
return 0;
}
@@ -7476,11 +7476,11 @@ qeth_softsetup_card(struct qeth_card *card)
QETH_DBF_TEXT_(setup, 2, "1err%d", rc);
if (rc == 0xe080){
PRINT_WARN("LAN on card %s if offline! "
- "Continuing softsetup.\n",
+ "Waiting for STARTLAN from card.\n",
CARD_BUS_ID(card));
card->lan_online = 0;
- } else
- return rc;
+ }
+ return rc;
} else
card->lan_online = 1;
if (card->info.type==QETH_CARD_TYPE_OSN)
--
1.5.2.1
next prev parent reply other threads:[~2007-06-20 10:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-20 10:48 [PATCH 0/8] s390: network device driver fixes Frank Pavlic
2007-06-20 10:55 ` [PATCH 1/8] s390: print correct level for HiperSockets devices Frank Pavlic
2007-06-20 23:13 ` Jeff Garzik
2007-06-20 10:56 ` Frank Pavlic [this message]
2007-06-20 10:58 ` [PATCH 3/8] s390: avoid inconsistent lock state in qeth Frank Pavlic
2007-06-20 10:59 ` [PATCH 4/8] s390: qeth: wrong packet length in qdio header Frank Pavlic
2007-06-20 11:00 ` [PATCH 5/8] s390: Use ccw_device_get_id() in qeth/claw drivers Frank Pavlic
2007-06-20 11:01 ` [PATCH 6/8] s390: don't call iucv_path_connect from tasklet context Frank Pavlic
2007-06-20 11:02 ` [PATCH 7/8] s390: netiucv spinlock initializer cleanup Frank Pavlic
2007-06-20 11:03 ` [PATCH 8/8] s390: netiucv inlining cleanup Frank Pavlic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070620105649.GB9454@de.ibm.com \
--to=fpavlic@de.ibm.com \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).